dac7b00e9e
Merge branch 'master' into qiuyesuifeng/date_add_func
2015-10-19 14:35:23 +08:00
486089f450
Merge remote-tracking branch 'origin/master' into shenli/add-priv-step2
...
Conflicts:
stmt/stmts/account_manage.go
2015-10-16 14:24:11 +08:00
1466a477ae
parser: fix issue#340 and add test
2015-10-15 19:57:16 +08:00
a4aa3e72e6
parser/parser.y: add StringType OptCharset OptCollate support
...
to support sql like "Create Table test(a CHAR(10) CHARACTER SET utf8)", see details:
"https://dev.mysql.com/doc/refman/5.0/en/create-table.html ",
data_type:
...
| CHAR[(length)] [BINARY]
[CHARACTER SET charset_name] [COLLATE collation_name]
2015-10-15 15:49:29 +08:00
ff8546a539
parser: add parser test.
2015-10-13 16:40:10 +08:00
33016df971
Merge pull request #360 from pingcap/siddontang/like-escape
...
support like escape
2015-10-13 10:47:57 +08:00
8fec2e463d
Merge pull request #350 from pingcap/sheni/issue-320
...
*: SubSelect can be used as select statement
2015-10-13 10:33:37 +08:00
0f2a4b1be2
Merge remote-tracking branch 'origin/master' into shenli/add-priv-step2
...
Conflicts:
parser/parser.y
parser/scanner.l
2015-10-13 10:09:11 +08:00
6c9cf0690a
parser: add test
2015-10-12 17:37:49 +08:00
001a9f923d
*: merge master and fix conflict
2015-10-12 17:36:31 +08:00
abe94aa2ba
parser: Solve merge problem
2015-10-12 13:35:01 +08:00
5e56f52810
Merge remote-tracking branch 'origin/master' into sheni/issue-320
...
Conflicts:
parser/parser_test.go
2015-10-12 13:29:49 +08:00
3c98e2f359
Merge remote-tracking branch 'origin/master' into shenli/trim
...
Conflicts:
parser/parser_test.go
2015-10-12 11:43:12 +08:00
dec67d7ee5
Merge remote-tracking branch 'origin/master' into shenli/add-priv-step2
...
Conflicts:
parser/parser_test.go
2015-10-12 11:30:17 +08:00
dc5e31c754
parser: Address comment
2015-10-12 11:18:09 +08:00
13051f54f5
parser: Address commment
2015-10-12 11:07:34 +08:00
1661b650fa
parser: Split parser test cases
...
Avoid pr conflict
2015-10-12 10:59:04 +08:00
d32e4f5153
*: support like escape
2015-10-12 09:56:52 +08:00
ee5bbd0de1
*: Check float length in parser
...
Fix https://github.com/pingcap/tidb/issues/312
2015-10-11 15:53:35 +08:00
4e3b9bafe9
*: SubSelect can be used as select statement
...
Fix https://github.com/pingcap/tidb/issues/320
2015-10-11 15:21:43 +08:00
32821500b7
Merge pull request #342 from pingcap/shenli/show-where-like
...
*: Support like/where clause in show tables statement.
2015-10-10 16:00:27 +08:00
38abb35769
*: Support trim function
...
See: https://dev.mysql.com/doc/refman/5.7/en/string-functions.html#function_trim
2015-10-10 14:57:40 +08:00
104d30ccb8
*: Support like/where clause in show tables statement.
...
Fix https://github.com/pingcap/tidb/issues/339
2015-10-10 11:47:41 +08:00
a3f17ab8f7
*: merge master and fix conflict.
2015-10-10 10:53:08 +08:00
e9433e5098
Merge pull request #338 from pingcap/siddontang/update-as
...
parser: update as option
2015-10-10 09:56:32 +08:00
ebe12aa2da
Merge remote-tracking branch 'origin/master' into shenli/locate
2015-10-09 23:19:42 +08:00
b1f1335a34
parser: clean up and add more test
2015-10-09 16:40:25 +08:00
3f126b65e2
parser: as support Identifier too.
2015-10-09 16:35:42 +08:00
d2bb1911f9
parser: update as option
...
select field alias can support back/double/single quote
2015-10-09 15:27:46 +08:00
a3084198d4
Merge pull request #331 from pingcap/siddontang/time-current-date
...
support time current date function
2015-10-09 11:21:09 +08:00
f8361752aa
parser: support extract time function
2015-10-09 10:13:05 +08:00
2a5f7b6912
parser: row is an unserved key word
2015-10-08 17:22:32 +08:00
0bc684868f
*: Support locate function
...
See: https://dev.mysql.com/doc/refman/5.7/en/string-functions.html#function_locate
2015-10-08 16:26:15 +08:00
be58e070a3
parser: support current date
2015-10-08 16:00:37 +08:00
2e6fd071b6
Merge pull request #321 from pingcap/siddontang/dev-union
...
dev union
2015-10-08 15:26:04 +08:00
d40ee39dc3
*: merge master and fix conflict
2015-10-08 15:21:09 +08:00
f0df7451c0
parser: Support check clause
2015-10-08 15:12:06 +08:00
3c69db4ce3
parser: Support dollar in identifier
2015-10-08 14:36:53 +08:00
812d7d874c
*: insert support select union
2015-10-08 08:33:34 +08:00
4cc7351fa9
parser: sub select support union
2015-10-07 21:57:53 +08:00
67864a44c4
*: support order by, limit and parenthesis in union parser
2015-10-07 17:10:59 +08:00
f9e6cd87d6
Merge pull request #314 from pingcap/siddontang/string-function
...
update string function
2015-10-07 13:10:48 +08:00
cd612c05b6
parser: support lower and parser
2015-10-07 12:03:09 +08:00
83904d21d1
Add OriginText tests for SubSelect
2015-10-07 11:44:13 +08:00
912164d251
parser: Fix #288
...
Fix get text of subselect statement.
2015-10-07 11:41:32 +08:00
51203fda5f
Merge pull request #287 from pingcap/siddontang/show-create-table
...
support show create table syntax
2015-10-07 11:06:46 +08:00
2eb08c0033
Merge remote-tracking branch 'origin/master' into shenli/add-priv-step2
2015-10-02 15:37:04 +08:00
dffe013e79
parser: update identifier quote
2015-09-30 10:34:35 +08:00
597b5c56b3
parser: fix select '\'a\''; parse bug
2015-09-29 16:50:29 +08:00
0b308dc4ee
*: merge master and fix conflict
2015-09-29 13:02:18 +08:00
