Commit Graph

27 Commits

Author SHA1 Message Date
8b114e46c8 parser: resolve the last R/R conflict 2015-09-09 18:00:37 +08:00
78c201e218 parser: resolve reduce/reduce conflicts
Resolved all the reduce/reduce conflicts except for 1

Fixes issue #73
2015-09-09 16:13:01 +08:00
5e8f71a534 Merge pull request #65 from pingcap/parser
Parser: Adjust the syntax error log
2015-09-09 11:33:37 +08:00
xia
0a83469458 parser: add the missing fields 2015-09-09 11:00:30 +08:00
1e4cdb813f *: update QL-LICENSE and STRUTIL-LICENSE. 2015-09-08 19:25:50 +08:00
xia
3a0f468e35 Merge branch 'master' into zimuxia/parser 2015-09-08 18:06:02 +08:00
xia
2d18057f9d parser: update 2015-09-08 17:36:23 +08:00
6e3e1c100d Merge pull request #41 from pingcap/zimuxia/makefile
*: Add "make check"
2015-09-08 16:12:39 +08:00
xia
bd7cd5cbb6 Merge branch 'master' into zimuxia/parser 2015-09-08 15:10:11 +08:00
xia
a7f86ad0ef parser: adjust the syntax error log 2015-09-08 15:07:03 +08:00
f87692e639 Merge pull request #46 from pingcap/c4pt0r/fix-copyright-infringement
c4pt0r/fix copyright infringement
2015-09-08 13:57:41 +08:00
e197ea9754 parser: Add mode into UnReservedKeyword list
"mode" can be used as an identifier.
See: https://dev.mysql.com/doc/refman/5.7/en/keywords.html
2015-09-08 10:50:46 +08:00
xia
a69f6551ba Merge branch 'master' into zimuxia/makefile 2015-09-07 21:33:31 +08:00
b2d62f9fb6 mysqldef, kv, stmt, stmt/stmts, parser, field: fix-copyright-infringement. 2015-09-07 09:05:15 -04:00
46e8bdc976 Merge pull request #33 from pingcap/shenli/syntax-error
parser: Change syntax error log
2015-09-07 17:44:26 +08:00
e84fca5979 parser: Change err0
Address comment
2015-09-07 17:36:32 +08:00
xia
2227e45019 parser: update the previous change by mistake 2015-09-07 16:18:25 +08:00
xia
3d8874860f parser: pass go vet
pass go vet
2015-09-07 15:08:32 +08:00
8bd63a4d12 parser: Change syntax error log
Make syntax log easy to read.

https://github.com/pingcap/tidb/issues/25
2015-09-07 12:02:21 +08:00
xia
0670dd0e34 *: pass gofmt
pass gofmt
2015-09-07 11:28:10 +08:00
8663db2c13 parser: Remove useless code
Address comment
2015-09-07 10:21:29 +08:00
84b2a6b8af parser: Support Convert better and add unit test
1. Change FunctionCast.String() to support Convert String()
2. Add unit test in parser for convert
2015-09-06 23:23:39 +08:00
05816bdb30 parser: Add convert type function
Support mysql builtin function CONVERT(expr,type)

See: https://dev.mysql.com/doc/refman/5.7/en/cast-functions.html#function_convert
2015-09-06 22:38:01 +08:00
cab1ed9fdd Merge pull request #16 from pingcap/zimuxia/go-vet
Pass go vet
2015-09-06 20:32:33 +08:00
xia
f49398dc42 *: pass go vet
pass go vet
2015-09-06 20:20:21 +08:00
ced00cc547 *: Remove conversion function
It is useless in MySQL and will cause conflict with
year/time/datetime/date function.
2015-09-06 18:07:17 +08:00
0d6f270068 Add files 2015-09-06 12:08:47 +08:00