From 01760a20b5eb95e63ffed7835d16adfae521b06b Mon Sep 17 00:00:00 2001 From: wenshao Date: Sun, 14 Sep 2014 21:48:18 +0800 Subject: [PATCH 1/2] improve mysql createTable parser --- .../mysql/parser/MySqlCreateTableParser.java | 24 +++++++++++++++++++ .../mysql/visitor/MySqlOutputVisitor.java | 5 ++++ .../mysql/visitor/MySqlSchemaStatVisitor.java | 13 ++++++++-- 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java index 43f293e5c1..c0dcbce1e1 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java @@ -22,6 +22,7 @@ import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.sql.ast.statement.SQLForeignKeyConstraint; import com.alibaba.druid.sql.ast.statement.SQLSelect; import com.alibaba.druid.sql.ast.statement.SQLTableConstraint; +import com.alibaba.druid.sql.ast.statement.SQLTableSource; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlKey; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlPrimaryKey; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlUnique; @@ -338,6 +339,29 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { stmt.getTableOptions().put("STATS_PERSISTENT", this.exprParser.expr()); continue; } + + if (identifierEquals("STATS_SAMPLE_PAGES")) { + lexer.nextToken(); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + + stmt.getTableOptions().put("STATS_SAMPLE_PAGES", this.exprParser.expr()); + continue; + } + + if (lexer.token() == Token.UNION) { + lexer.nextToken(); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + + accept(Token.LPAREN); + SQLTableSource tableSrc = this.createSQLSelectParser().parseTableSource(); + stmt.getTableOptions().put("UNION", tableSrc); + accept(Token.RPAREN); + continue; + } if (lexer.token() == Token.TABLESPACE) { lexer.nextToken(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java index 4897da7bfb..76a8228030 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java @@ -478,6 +478,11 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV print(' '); option.getValue().accept(this); continue; + } else if ("UNION".equals(key)) { + print(" = ("); + option.getValue().accept(this); + print(')'); + continue; } print(" = "); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java index 5febee2adb..3c0e104d5a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java @@ -27,6 +27,7 @@ import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.ast.statement.SQLTableSource; import com.alibaba.druid.sql.ast.statement.SQLUnionQuery; import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlForceIndexHint; @@ -1156,7 +1157,15 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS @Override public boolean visit(MySqlCreateTableStatement x) { - return super.visit((SQLCreateTableStatement) x); + boolean val = super.visit((SQLCreateTableStatement) x); + + for (SQLObject option : x.getTableOptions().values()) { + if (option instanceof SQLTableSource) { + option.accept(this); + } + } + + return val; } @Override @@ -1341,7 +1350,7 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS @Override public void endVisit(MySqlHintStatement x) { - + } } From 675ef128fbf75c4d887ada73efab7b179f7f38cd Mon Sep 17 00:00:00 2001 From: wenshao Date: Sun, 14 Sep 2014 21:48:40 +0800 Subject: [PATCH 2/2] add testcase --- .../bvt/sql/mysql/MySqlCreateTableTest55.java | 54 +++++++++++++++++++ .../bvt/sql/mysql/MySqlCreateTableTest56.java | 54 +++++++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest55.java create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest56.java diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest55.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest55.java new file mode 100644 index 0000000000..ce11d47989 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest55.java @@ -0,0 +1,54 @@ +/* + * Copyright 1999-2011 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.bvt.sql.mysql; + +import org.junit.Assert; +import org.junit.Test; + +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.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; + +public class MySqlCreateTableTest55 extends MysqlTest { + + @Test + public void test_union() throws Exception { + String sql = "CREATE TABLE tableA (datasn varchar(100) NOT NULL,PRIMARY KEY(datasn)) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 UNION=(tableB)"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + SQLStatement stmt = parser.parseCreateTable(); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + + Assert.assertEquals(2, visitor.getTables().size()); + Assert.assertEquals(1, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getConditions().size()); + + String output = SQLUtils.toMySqlString(stmt); + Assert.assertEquals("CREATE TABLE tableA (" // + + "\n\tdatasn varchar(100) NOT NULL, " // + + "\n\tPRIMARY KEY (datasn)" // + + "\n) ENGINE = MRG_MyISAM CHARSET = utf8 UNION = (tableB)", output); + + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest56.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest56.java new file mode 100644 index 0000000000..16fa1b6c84 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest56.java @@ -0,0 +1,54 @@ +/* + * Copyright 1999-2011 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.bvt.sql.mysql; + +import org.junit.Assert; +import org.junit.Test; + +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.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; + +public class MySqlCreateTableTest56 extends MysqlTest { + + @Test + public void test_union() throws Exception { + String sql = "CREATE TABLE tableA (datasn varchar(100) NOT NULL,PRIMARY KEY(datasn)) ENGINE=MRG_MyISAM DEFAULT CHARSET=utf8 UNION=(tableB,tableC)"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + SQLStatement stmt = parser.parseCreateTable(); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + + Assert.assertEquals(3, visitor.getTables().size()); + Assert.assertEquals(1, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getConditions().size()); + + String output = SQLUtils.toMySqlString(stmt); + Assert.assertEquals("CREATE TABLE tableA (" // + + "\n\tdatasn varchar(100) NOT NULL, " // + + "\n\tPRIMARY KEY (datasn)" // + + "\n) ENGINE = MRG_MyISAM CHARSET = utf8 UNION = (tableB, tableC)", output); + + } +}