Commit Graph

59 Commits

Author SHA1 Message Date
9d7e50c8ee Merge pull request #117 from pingcap/shenli/set-charset
parser: Charset name can be string literal
2015-09-11 23:25:10 +08:00
811e4b99d1 parser: Fix alignment
Address comment
2015-09-11 23:11:35 +08:00
ee84db6d6b parser/parser.y: S/R conflicts 1->0. 2015-09-11 15:01:26 +02:00
1d23a43c3f parser/parser.y: S/R conflicts 2->1. 2015-09-11 13:55:15 +02:00
de4eb12af8 parser/parser.y: S/R conflicts 3->2. 2015-09-11 12:36:33 +02:00
f497c05795 parser/parser.y: S/R conflicts 4->3. 2015-09-11 11:49:37 +02:00
5d3284da6f parser: Charset name can be string literal
Fix bug in running phpMyAdmin
2015-09-11 17:46:04 +08:00
b13d935670 Merge pull request #114 from pingcap/shenli/show-variables
Shenli/show variables
2015-09-11 17:37:20 +08:00
3ec8d27a71 parser/parser.y: S/R conflicts 9->4. 2015-09-11 10:23:35 +02:00
6ce10d1a4d expressions,parser: IN expression uses subquery 2015-09-11 13:45:47 +08:00
15eaba81a2 Merge pull request #104 from cznic/master
parser/parser.y: S/R conflicts 10->9.
2015-09-11 12:38:26 +08:00
825bb7c6a3 expressions: update subquery 2015-09-11 11:48:51 +08:00
e052e57ef9 parser/parser.y: S/R conflicts 10->9. 2015-09-10 19:48:21 +02:00
6c292141f0 Merge pull request #102 from cznic/master
parser/parser.y: S/R conflicts 11->10.
2015-09-10 23:31:31 +08:00
396b0a2bca Merge pull request #100 from pingcap/coocood/convert
util/types, column, expressions: use types.Convert to replace Col.Cas…
2015-09-10 23:30:54 +08:00
0b06ec79ae parser/parser.y: S/R conflicts 11->10. 2015-09-10 14:45:19 +02:00
20cf24f535 *: Implement show variables stmt/rset/plan
TODO: add test cases
2015-09-10 20:24:09 +08:00
a80d131c06 util/types, column, expressions: use types.Convert to replace Col.CastValue
The two methods has similar functionality and has complex logic, after this change,
the code base would be easier to maintain.

For `CAST` function, the behaviour is different than the general purpose `types.Convert`,
so I implemented a dedicated function for it.
2015-09-10 20:11:40 +08:00
a6998ebe42 parser/parser.y: S/R conflicts 18->11. 2015-09-10 14:06:45 +02:00
288fc4bc17 parser: Support SHOW VARIABLES syntax
Finish parser, implement in the next commit.
2015-09-10 19:32:04 +08:00
bc95ddd9f5 parser/parser.y: Remove superfluous production of FieldOpts. (S/R conflicts 24->18). 2015-09-10 13:16:10 +02:00
89455adedc Merge pull request #89 from pingcap/coocood/unify-int-type
*: unify all integer types to int64 and uint64
2015-09-10 11:26:49 +08:00
3b283fb619 Address comment 2015-09-10 11:00:40 +08:00
546431339e Address comment 2015-09-10 10:43:53 +08:00
e9f0c697fc parser: support row constructor 2015-09-10 08:32:40 +08:00
25eac139ad parser: Address comment 2015-09-10 07:41:43 +08:00
bd7817ea38 parser: Address comment 2015-09-09 23:28:20 +08:00
211eadbb09 parser: Fix typo
Address comment
2015-09-09 23:08:27 +08:00
f5a46df71e parser: Change lower_than_eq to lowerThanEq
Fix golint error
2015-09-09 22:41:54 +08:00
e3e186c831 Merge remote-tracking branch 'origin/master' into shenli/keyword-identifier 2015-09-09 22:33:48 +08:00
a5e0858986 *: unify all integer types to int64 and uint64
Simplify type related codes.
2015-09-09 22:21:15 +08:00
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
3f6a369e11 parser: Add more keywords into UnReservedKeyword list
See: https://dev.mysql.com/doc/refman/5.7/en/keywords.html
2015-09-09 14:33:48 +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