Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

improved sql parser ads support.

Browse Source
This commit is contained in:
wenshao
2018-02-04 13:36:44 +08:00
parent 8c3783310c
commit 9ff64e48ed
3 changed files with 138 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java
+15 -1
View File
@@ -172,7 +172,21 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
stmt.getTableElementList().add(idx);
} else if (lexer.token() == (Token.KEY)) {
stmt.getTableElementList().add(parseConstraint());
Lexer.SavePoint savePoint = lexer.mark();
lexer.nextToken();
boolean isColumn = false;
if (lexer.identifierEquals(FnvHash.Constants.VARCHAR)) {
isColumn = true;
}
lexer.reset(savePoint);
if (isColumn) {
column = this.exprParser.parseColumn();
stmt.getTableElementList().add(column);
} else {
stmt.getTableElementList().add(parseConstraint());
}
} else if (lexer.token() == (Token.PRIMARY)) {
SQLTableConstraint pk = parseConstraint();
pk.setParent(stmt);
src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+1
View File
@@ -1333,6 +1333,7 @@ public class SQLExprParser extends SQLParser {
case SCHEMA:
case INTERVAL:
case EXPLAIN:
case PARTITION:
case SET:
identName = lexer.stringVal();
lexer.nextToken();
src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest98_keyword.java
+122
View File
@@ -0,0 +1,122 @@
package com.alibaba.druid.bvt.sql.mysql.createTable;
import com.alibaba.druid.sql.MysqlTest;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement;
import com.alibaba.druid.util.JdbcConstants;
import java.util.List;
public class MySqlCreateTableTest98_keyword extends MysqlTest {
public void test_0() throws Exception {
String sql = " CREATE TABLE IF NOT EXISTS meta.view (\n" +
" cluster_name varchar(16) ,\n" +
" table_schema varchar(128), \n" +
" view_name varchar(128), \n" +
" column_list text, \n" +
" sql text\n" +
" )";
List<SQLStatement> statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL);
MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0);
assertEquals(1, statementList.size());
assertEquals(5, stmt.getTableElementList().size());
assertEquals("CREATE TABLE IF NOT EXISTS meta.view (\n" +
"\tcluster_name varchar(16),\n" +
"\ttable_schema varchar(128),\n" +
"\tview_name varchar(128),\n" +
"\tcolumn_list text,\n" +
"\tsql text\n" +
")", stmt.toString());
}
public void test_1() throws Exception {
String sql = " CREATE TABLE IF NOT EXISTS meta.partitions (\n" +
" cluster_name varchar(16) ,\n" +
" table_schema varchar(128), \n" +
" view_name varchar(128), \n" +
" column_list text, \n" +
" sql text\n" +
" )";
List<SQLStatement> statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL);
MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0);
assertEquals(1, statementList.size());
assertEquals(5, stmt.getTableElementList().size());
assertEquals("CREATE TABLE IF NOT EXISTS meta.partitions (\n" +
"\tcluster_name varchar(16),\n" +
"\ttable_schema varchar(128),\n" +
"\tview_name varchar(128),\n" +
"\tcolumn_list text,\n" +
"\tsql text\n" +
")", stmt.toString());
}
public void test_2() throws Exception {
String sql = " CREATE TABLE IF NOT EXISTS meta.partitions (\n" +
" cluster_name varchar(16) ,\n" +
" table_schema varchar(128), \n" +
" partition varchar(128), \n" +
" column_list text, \n" +
" sql text\n" +
" )";
List<SQLStatement> statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL);
MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0);
assertEquals(1, statementList.size());
assertEquals(5, stmt.getTableElementList().size());
assertEquals("CREATE TABLE IF NOT EXISTS meta.partitions (\n" +
"\tcluster_name varchar(16),\n" +
"\ttable_schema varchar(128),\n" +
"\tpartition varchar(128),\n" +
"\tcolumn_list text,\n" +
"\tsql text\n" +
")", stmt.toString());
}
public void test_3() throws Exception {
String sql = "create table IF NOT EXISTS meta.build_table_statistic_info("
+ " cluster_name varchar(16), "
+ " table_schema varchar(128), "
+ " table_name varchar(128), "
+ " key varchar(128), "
+ " value varchar(128), "
+ " table_schema_id varchar(128), "
+ " table_id varchar(128), "
+ " data_version bigint, "
+ " create_time timestamp, "
+ " update_time timestamp"
+ ")";
List<SQLStatement> statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL);
MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0);
assertEquals(1, statementList.size());
assertEquals(10, stmt.getTableElementList().size());
assertEquals("CREATE TABLE IF NOT EXISTS meta.build_table_statistic_info (\n" +
"\tcluster_name varchar(16),\n" +
"\ttable_schema varchar(128),\n" +
"\ttable_name varchar(128),\n" +
"\tkey varchar(128),\n" +
"\tvalue varchar(128),\n" +
"\ttable_schema_id varchar(128),\n" +
"\ttable_id varchar(128),\n" +
"\tdata_version bigint,\n" +
"\tcreate_time timestamp,\n" +
"\tupdate_time timestamp\n" +
")", stmt.toString());
}
}