From ea6a85e8a15e7d8a4bf55a20c15f85628d37f190 Mon Sep 17 00:00:00 2001 From: wenshao Date: Sat, 27 Apr 2013 19:11:56 +0800 Subject: [PATCH 1/3] improve sql parser --- .../dialect/mysql/parser/MySqlExprParser.java | 19 +++-- .../bvt/sql/mysql/MySqlCreateTableTest18.java | 74 +++++++++++++++++++ 2 files changed, 88 insertions(+), 5 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest18.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java index 953ba79fbd..235acf01ce 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java @@ -710,18 +710,27 @@ public class MySqlExprParser extends SQLExprParser { public MySqlUnique parseUnique() { accept(Token.UNIQUE); + + if (lexer.token() == Token.KEY) { + lexer.nextToken(); + } - MySqlUnique primaryKey = new MySqlUnique(); + MySqlUnique unique = new MySqlUnique(); if (identifierEquals("USING")) { lexer.nextToken(); - primaryKey.setIndexType(lexer.stringVal()); + unique.setIndexType(lexer.stringVal()); lexer.nextToken(); } - + + if (lexer.token() != Token.LPAREN) { + SQLName name = name(); + unique.setName(name); + } + accept(Token.LPAREN); for (;;) { - primaryKey.getColumns().add(this.expr()); + unique.getColumns().add(this.expr()); if (!(lexer.token() == (Token.COMMA))) { break; } else { @@ -730,7 +739,7 @@ public class MySqlExprParser extends SQLExprParser { } accept(Token.RPAREN); - return primaryKey; + return unique; } public MySqlForeignKey parseForeignKey() { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest18.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest18.java new file mode 100644 index 0000000000..2504eb3179 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest18.java @@ -0,0 +1,74 @@ +/* + * 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 java.util.List; + +import org.junit.Assert; + +import com.alibaba.druid.sql.MysqlTest; +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; +import com.alibaba.druid.stat.TableStat; +import com.alibaba.druid.stat.TableStat.Column; + +public class MySqlCreateTableTest18 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "CREATE TABLE IF NOT EXISTS `t_awards` (" + // + " `id` int(11) NOT NULL AUTO_INCREMENT," + // + " `seller_id` int(11) NOT NULL," + // + " `shop_id` int(11) DEFAULT NULL," + // + " `mode` int(4) NOT NULL," + // + " `draw_rate_1` int(11) NOT NULL," + // + " `draw_rate_2` int(11) NOT NULL," + // + " `amount` int(11) NOT NULL," + // + " `position_code` int(11) NOT NULL," + // + " `f_denomination` int(11) DEFAULT NULL," + // + " `f_description` text," + // + " `f_url` text," + // + " `f_type` int(4) DEFAULT NULL," + // + " PRIMARY KEY (`id`)," + // + " UNIQUE KEY `id` (`id`)" + // + ") ENGINE=InnoDB DEFAULT CHARSET=gbk" + // + ";"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + statemen.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(12, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getConditions().size()); + + Assert.assertTrue(visitor.getTables().containsKey( + new TableStat.Name("t_awards"))); + + Assert.assertTrue(visitor.getColumns().contains(new Column("t_awards", "f_type"))); + } +} From 702450751950240a326b80e663e8f87034954728 Mon Sep 17 00:00:00 2001 From: wenshao Date: Sat, 27 Apr 2013 23:59:36 +0800 Subject: [PATCH 2/3] improve mysql parser --- .../statement/MySqlCreateTableStatement.java | 52 ++- .../mysql/parser/MySqlCreateTableParser.java | 340 +++++++++++++----- .../mysql/visitor/MySqlOutputVisitor.java | 51 ++- .../bvt/sql/mysql/MySqlCreateTableTest19.java | 55 +++ .../bvt/sql/mysql/MySqlCreateTableTest20.java | 55 +++ .../bvt/sql/mysql/MySqlCreateTableTest21.java | 55 +++ .../bvt/sql/oracle/OracleSelectTest42.java | 3 +- 7 files changed, 477 insertions(+), 134 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest19.java create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest20.java create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest21.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatement.java index 96669f9e2f..f7ad836f19 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatement.java @@ -21,8 +21,10 @@ import java.util.List; import java.util.Map; import com.alibaba.druid.sql.ast.SQLCommentHint; +import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLPartitioningClause; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; +import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.ast.statement.SQLSelect; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; @@ -38,11 +40,28 @@ public class MySqlCreateTableStatement extends SQLCreateTableStatement implement private SQLPartitioningClause partitioning; + private List hints = new ArrayList(); + + private SQLExprTableSource like; + public MySqlCreateTableStatement(){ } - private List hints = new ArrayList(); + public SQLExprTableSource getLike() { + return like; + } + + public void setLike(SQLName like) { + this.setLike(new SQLExprTableSource(like)); + } + + public void setLike(SQLExprTableSource like) { + if (like != null) { + like.setParent(this); + } + this.like = like; + } public List getHints() { return hints; @@ -76,35 +95,6 @@ public class MySqlCreateTableStatement extends SQLCreateTableStatement implement this.query = query; } - @Override - public void output(StringBuffer buf) { - if (Type.GLOBAL_TEMPORARY.equals(this.type)) { - buf.append("CREATE TEMPORARY TABLE "); - } else { - buf.append("CREATE TABLE "); - } - - if (ifNotExiists) { - buf.append("IF NOT EXISTS "); - } - - this.tableSource.output(buf); - buf.append(" "); - buf.append("("); - for (int i = 0, size = tableElementList.size(); i < size; ++i) { - if (i != 0) { - buf.append(", "); - } - tableElementList.get(i).output(buf); - } - buf.append(")"); - - if (query != null) { - buf.append(" "); - query.output(buf); - } - } - public boolean isIfNotExiists() { return ifNotExiists; } @@ -127,6 +117,8 @@ public class MySqlCreateTableStatement extends SQLCreateTableStatement implement this.acceptChild(visitor, getHints()); this.acceptChild(visitor, getTableSource()); this.acceptChild(visitor, getTableElementList()); + this.acceptChild(visitor, getLike()); + this.acceptChild(visitor, getQuery()); } visitor.endVisit(this); } 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 b0e353347a..6a30db043a 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 @@ -72,67 +72,78 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { stmt.setName(this.exprParser.name()); + if (lexer.token() == Token.LIKE) { + lexer.nextToken(); + SQLName name = this.exprParser.name(); + stmt.setLike(name); + } + if (lexer.token() == (Token.LPAREN)) { lexer.nextToken(); - for (;;) { - if (lexer.token() == Token.IDENTIFIER || lexer.token() == Token.LITERAL_CHARS) { - SQLColumnDefinition column = this.exprParser.parseColumn(); - stmt.getTableElementList().add(column); - } else if (lexer.token() == Token.CONSTRAINT // - || lexer.token() == Token.PRIMARY // - || lexer.token() == Token.UNIQUE - ) { - stmt.getTableElementList().add(parseConstraint()); - } else if (lexer.token() == (Token.INDEX)) { - lexer.nextToken(); + if (lexer.token() == Token.LIKE) { + lexer.nextToken(); + SQLName name = this.exprParser.name(); + stmt.setLike(name); + } else { + for (;;) { + if (lexer.token() == Token.IDENTIFIER || lexer.token() == Token.LITERAL_CHARS) { + SQLColumnDefinition column = this.exprParser.parseColumn(); + stmt.getTableElementList().add(column); + } else if (lexer.token() == Token.CONSTRAINT // + || lexer.token() == Token.PRIMARY // + || lexer.token() == Token.UNIQUE) { + stmt.getTableElementList().add(parseConstraint()); + } else if (lexer.token() == (Token.INDEX)) { + lexer.nextToken(); - MySqlTableIndex idx = new MySqlTableIndex(); + MySqlTableIndex idx = new MySqlTableIndex(); - if (lexer.token() == Token.IDENTIFIER) { - if (!"USING".equalsIgnoreCase(lexer.stringVal())) { - idx.setName(this.exprParser.name()); + if (lexer.token() == Token.IDENTIFIER) { + if (!"USING".equalsIgnoreCase(lexer.stringVal())) { + idx.setName(this.exprParser.name()); + } } - } - if (identifierEquals("USING")) { - lexer.nextToken(); - idx.setIndexType(lexer.stringVal()); - lexer.nextToken(); - } - - accept(Token.LPAREN); - for (;;) { - idx.getColumns().add(this.exprParser.expr()); - if (!(lexer.token() == (Token.COMMA))) { - break; - } else { + if (identifierEquals("USING")) { + lexer.nextToken(); + idx.setIndexType(lexer.stringVal()); lexer.nextToken(); } + + accept(Token.LPAREN); + for (;;) { + idx.getColumns().add(this.exprParser.expr()); + if (!(lexer.token() == (Token.COMMA))) { + break; + } else { + lexer.nextToken(); + } + } + accept(Token.RPAREN); + + stmt.getTableElementList().add(idx); + } else if (lexer.token() == (Token.KEY)) { + stmt.getTableElementList().add(parseConstraint()); + } else if (lexer.token() == (Token.PRIMARY)) { + stmt.getTableElementList().add(parseConstraint()); + } else if (lexer.token() == (Token.FOREIGN)) { + MySqlForeignKey fk = this.getExprParser().parseForeignKey(); + stmt.getTableElementList().add(fk); + } else if (lexer.token() == Token.CHECK) { + lexer.nextToken(); + SQLCheck check = new SQLCheck(); + accept(Token.LPAREN); + check.setExpr(this.exprParser.expr()); + accept(Token.RPAREN); + stmt.getTableElementList().add(check); } - accept(Token.RPAREN); - stmt.getTableElementList().add(idx); - } else if (lexer.token() == (Token.KEY)) { - stmt.getTableElementList().add(parseConstraint()); - } else if (lexer.token() == (Token.PRIMARY)) { - stmt.getTableElementList().add(parseConstraint()); - } else if (lexer.token() == (Token.FOREIGN)) { - MySqlForeignKey fk = this.getExprParser().parseForeignKey(); - stmt.getTableElementList().add(fk); - } else if (lexer.token() == Token.CHECK) { - lexer.nextToken(); - SQLCheck check = new SQLCheck(); - accept(Token.LPAREN); - check.setExpr(this.exprParser.expr()); - accept(Token.RPAREN); - stmt.getTableElementList().add(check); - } - - if (!(lexer.token() == (Token.COMMA))) { - break; - } else { - lexer.nextToken(); + if (!(lexer.token() == (Token.COMMA))) { + break; + } else { + lexer.nextToken(); + } } } @@ -142,20 +153,176 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { for (;;) { if (identifierEquals("ENGINE")) { lexer.nextToken(); - accept(Token.EQ); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } stmt.getTableOptions().put("ENGINE", lexer.stringVal()); lexer.nextToken(); continue; } - + if (identifierEquals("AUTO_INCREMENT")) { lexer.nextToken(); - accept(Token.EQ); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } stmt.getTableOptions().put("AUTO_INCREMENT", lexer.numberString()); lexer.nextToken(); continue; } + if (identifierEquals("AVG_ROW_LENGTH")) { + lexer.nextToken(); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + stmt.getTableOptions().put("AVG_ROW_LENGTH", lexer.numberString()); + lexer.nextToken(); + continue; + } + + if (lexer.token() == Token.DEFAULT) { + lexer.nextToken(); + parseTableOptionCharsetOrCollate(stmt); + continue; + } + + if (parseTableOptionCharsetOrCollate(stmt)) { + continue; + } + + if (identifierEquals("CHECKSUM")) { + lexer.nextToken(); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + stmt.getTableOptions().put("CHECKSUM", lexer.numberString()); + lexer.nextToken(); + continue; + } + + if (identifierEquals("COMMENT")) { + lexer.nextToken(); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + stmt.getTableOptions().put("COMMENT", lexer.stringVal()); + lexer.nextToken(); + continue; + } + + if (identifierEquals("CONNECTION")) { + lexer.nextToken(); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + stmt.getTableOptions().put("CONNECTION", lexer.stringVal()); + lexer.nextToken(); + continue; + } + + if (identifierEquals("DATA")) { + lexer.nextToken(); + acceptIdentifier("DIRECTORY"); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + stmt.getTableOptions().put("DATA DIRECTORY", lexer.stringVal()); + lexer.nextToken(); + continue; + } + + if (identifierEquals("DELAY_KEY_WRITE")) { + lexer.nextToken(); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + stmt.getTableOptions().put("DELAY_KEY_WRITE", lexer.stringVal()); + lexer.nextToken(); + continue; + } + + if (identifierEquals("INDEX")) { + lexer.nextToken(); + acceptIdentifier("DIRECTORY"); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + stmt.getTableOptions().put("INDEX DIRECTORY", lexer.stringVal()); + lexer.nextToken(); + continue; + } + + if (identifierEquals("INSERT_METHOD")) { + lexer.nextToken(); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + stmt.getTableOptions().put("INSERT_METHOD", lexer.stringVal()); + lexer.nextToken(); + continue; + } + + if (identifierEquals("KEY_BLOCK_SIZE")) { + lexer.nextToken(); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + stmt.getTableOptions().put("KEY_BLOCK_SIZE", lexer.stringVal()); + lexer.nextToken(); + continue; + } + + if (identifierEquals("MAX_ROWS")) { + lexer.nextToken(); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + stmt.getTableOptions().put("MAX_ROWS", lexer.stringVal()); + lexer.nextToken(); + continue; + } + + if (identifierEquals("MIN_ROWS")) { + lexer.nextToken(); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + stmt.getTableOptions().put("MIN_ROWS", lexer.stringVal()); + lexer.nextToken(); + continue; + } + + if (identifierEquals("PACK_KEYS")) { + lexer.nextToken(); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + stmt.getTableOptions().put("PACK_KEYS", lexer.stringVal()); + lexer.nextToken(); + continue; + } + + if (identifierEquals("PASSWORD")) { + lexer.nextToken(); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + stmt.getTableOptions().put("PASSWORD", lexer.stringVal()); + lexer.nextToken(); + continue; + } + + if (identifierEquals("ROW_FORMAT")) { + lexer.nextToken(); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + stmt.getTableOptions().put("ROW_FORMAT", lexer.stringVal()); + lexer.nextToken(); + continue; + } + if (identifierEquals("TYPE")) { lexer.nextToken(); accept(Token.EQ); @@ -163,14 +330,6 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); continue; } - - if (identifierEquals("COMMENT")) { - lexer.nextToken(); - accept(Token.EQ); - stmt.getTableOptions().put("COMMENT", lexer.stringVal()); - lexer.nextToken(); - continue; - } if (identifierEquals("PARTITION")) { lexer.nextToken(); @@ -199,28 +358,6 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal()); } } - - if (lexer.token() == Token.DEFAULT) { - lexer.nextToken(); - if (identifierEquals("CHARACTER")) { - lexer.nextToken(); - accept(Token.SET); - if (lexer.token() == Token.EQ) { - lexer.nextToken(); - } - stmt.getTableOptions().put("CHARACTER SET", lexer.stringVal()); - lexer.nextToken(); - continue; - } else if (identifierEquals("CHARSET")) { - lexer.nextToken(); - if (lexer.token() == Token.EQ) { - lexer.nextToken(); - } - stmt.getTableOptions().put("CHARSET", lexer.stringVal()); - lexer.nextToken(); - continue; - } - } break; } @@ -236,6 +373,41 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { return stmt; } + + private boolean parseTableOptionCharsetOrCollate(MySqlCreateTableStatement stmt) { + if (identifierEquals("CHARACTER")) { + lexer.nextToken(); + accept(Token.SET); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + stmt.getTableOptions().put("CHARACTER SET", lexer.stringVal()); + lexer.nextToken(); + return true; + } + + if (identifierEquals("CHARSET")) { + lexer.nextToken(); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + stmt.getTableOptions().put("CHARSET", lexer.stringVal()); + lexer.nextToken(); + return true; + } + + if (identifierEquals("COLLATE")) { + lexer.nextToken(); + if (lexer.token() == Token.EQ) { + lexer.nextToken(); + } + stmt.getTableOptions().put("COLLATE", lexer.stringVal()); + lexer.nextToken(); + return true; + } + + return false; + } protected SQLTableConstaint parseConstraint() { SQLName name = null; @@ -276,7 +448,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { if (name != null) { key.setName(name); } - + if (identifierEquals("USING")) { lexer.nextToken(); key.setIndexType(lexer.stringVal()); 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 041cae0c0b..eb5830498c 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 @@ -295,13 +295,13 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV x.getDefaultExpr().accept(this); } } - + if (mysqlColumn != null && mysqlColumn.getOnUpdate() != null) { print(" ON UPDATE "); - + mysqlColumn.getOnUpdate().accept(this); } - + if (mysqlColumn != null && mysqlColumn.isAutoIncrement()) { print(" AUTO_INCREMENT"); } @@ -332,7 +332,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV printAndAccept(x.getArguments(), ", "); print(")"); } - + if (Boolean.TRUE == x.getAttribute("unsigned")) { print(" unsigned"); } @@ -426,19 +426,28 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV } x.getName().accept(this); - print(" ("); - incrementIndent(); - println(); - for (int i = 0, size = x.getTableElementList().size(); i < size; ++i) { - if (i != 0) { - print(", "); - println(); + + if (x.getLike() != null) { + print(" LIKE "); + x.getLike().accept(this); + } + + int size = x.getTableElementList().size(); + if (size > 0) { + print(" ("); + incrementIndent(); + println(); + for (int i = 0; i < size; ++i) { + if (i != 0) { + print(", "); + println(); + } + x.getTableElementList().get(i).accept(this); } - x.getTableElementList().get(i).accept(this); + decrementIndent(); + println(); + print(")"); } - decrementIndent(); - println(); - print(")"); for (Map.Entry option : x.getTableOptions().entrySet()) { String key = option.getKey(); @@ -448,9 +457,15 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV print(" = "); if ("COMMENT".equals(key)) { - print('\''); - print(option.getValue()); - print('\''); + new SQLCharExpr(option.getValue()).accept(this); + } else if ("CONNECTION".equals(key)) { + new SQLCharExpr(option.getValue()).accept(this); + } else if ("DATA DIRECTORY".equals(key)) { + new SQLCharExpr(option.getValue()).accept(this); + } else if ("INDEX DIRECTORY".equals(key)) { + new SQLCharExpr(option.getValue()).accept(this); + } else if ("PASSWORD".equals(key)) { + new SQLCharExpr(option.getValue()).accept(this); } else { print(option.getValue()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest19.java new file mode 100644 index 0000000000..bdd31e226c --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest19.java @@ -0,0 +1,55 @@ +/* + * 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 java.util.List; + +import org.junit.Assert; + +import com.alibaba.druid.sql.MysqlTest; +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; +import com.alibaba.druid.stat.TableStat; + +public class MySqlCreateTableTest19 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "CREATE TABLE new_tbl LIKE orig_tbl;"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + statemen.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(0, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getConditions().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("new_tbl"))); + + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest20.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest20.java new file mode 100644 index 0000000000..17befcc376 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest20.java @@ -0,0 +1,55 @@ +/* + * 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 java.util.List; + +import org.junit.Assert; + +import com.alibaba.druid.sql.MysqlTest; +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; +import com.alibaba.druid.stat.TableStat; + +public class MySqlCreateTableTest20 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "CREATE TABLE new_tbl (LIKE orig_tbl);"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + statemen.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(0, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getConditions().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("new_tbl"))); + + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest21.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest21.java new file mode 100644 index 0000000000..faece55591 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest21.java @@ -0,0 +1,55 @@ +/* + * 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 java.util.List; + +import org.junit.Assert; + +import com.alibaba.druid.sql.MysqlTest; +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; +import com.alibaba.druid.stat.TableStat; + +public class MySqlCreateTableTest21 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "CREATE TABLE new_tbl (LIKE orig_tbl);"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + statemen.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(0, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getConditions().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("new_tbl"))); + + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest42.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest42.java index 5ae58a4974..941a5a2262 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest42.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest42.java @@ -17,13 +17,12 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; public class OracleSelectTest42 extends OracleTest { From 524527dae929ab4c02cc0b4bafc445ffb25f221f Mon Sep 17 00:00:00 2001 From: wenshao Date: Sun, 28 Apr 2013 00:28:18 +0800 Subject: [PATCH 3/3] improve mysql parser --- .../statement/MySqlCreateTableStatement.java | 2 +- .../statement/MySqlSQLColumnDefinition.java | 15 ++++- .../mysql/parser/MySqlCreateTableParser.java | 46 ++++++++----- .../dialect/mysql/parser/MySqlExprParser.java | 8 +++ .../mysql/visitor/MySqlOutputVisitor.java | 14 +++- .../bvt/sql/mysql/MySqlCreateTableTest22.java | 65 +++++++++++++++++++ .../bvt/sql/mysql/MySqlCreateTableTest23.java | 64 ++++++++++++++++++ 7 files changed, 194 insertions(+), 20 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest22.java create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest23.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatement.java index f7ad836f19..26d42187f9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatement.java @@ -43,7 +43,7 @@ public class MySqlCreateTableStatement extends SQLCreateTableStatement implement private List hints = new ArrayList(); private SQLExprTableSource like; - + public MySqlCreateTableStatement(){ } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSQLColumnDefinition.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSQLColumnDefinition.java index 21f4968f7e..2bcc2351ba 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSQLColumnDefinition.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSQLColumnDefinition.java @@ -26,6 +26,8 @@ public class MySqlSQLColumnDefinition extends SQLColumnDefinition { private SQLExpr onUpdate; + private SQLExpr storage; + public MySqlSQLColumnDefinition(){ } @@ -38,12 +40,21 @@ public class MySqlSQLColumnDefinition extends SQLColumnDefinition { this.autoIncrement = autoIncrement; } - public SQLExpr getOnUpdate() { return onUpdate; } - + public void setOnUpdate(SQLExpr onUpdate) { this.onUpdate = onUpdate; } + + + public SQLExpr getStorage() { + return storage; + } + + + public void setStorage(SQLExpr storage) { + this.storage = storage; + } } 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 6a30db043a..2d88141b62 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 @@ -186,7 +186,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { parseTableOptionCharsetOrCollate(stmt); continue; } - + if (parseTableOptionCharsetOrCollate(stmt)) { continue; } @@ -200,7 +200,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); continue; } - + if (identifierEquals("COMMENT")) { lexer.nextToken(); if (lexer.token() == Token.EQ) { @@ -210,7 +210,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); continue; } - + if (identifierEquals("CONNECTION")) { lexer.nextToken(); if (lexer.token() == Token.EQ) { @@ -220,7 +220,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); continue; } - + if (identifierEquals("DATA")) { lexer.nextToken(); acceptIdentifier("DIRECTORY"); @@ -231,7 +231,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); continue; } - + if (identifierEquals("DELAY_KEY_WRITE")) { lexer.nextToken(); if (lexer.token() == Token.EQ) { @@ -241,7 +241,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); continue; } - + if (identifierEquals("INDEX")) { lexer.nextToken(); acceptIdentifier("DIRECTORY"); @@ -252,7 +252,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); continue; } - + if (identifierEquals("INSERT_METHOD")) { lexer.nextToken(); if (lexer.token() == Token.EQ) { @@ -262,7 +262,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); continue; } - + if (identifierEquals("KEY_BLOCK_SIZE")) { lexer.nextToken(); if (lexer.token() == Token.EQ) { @@ -272,7 +272,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); continue; } - + if (identifierEquals("MAX_ROWS")) { lexer.nextToken(); if (lexer.token() == Token.EQ) { @@ -282,7 +282,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); continue; } - + if (identifierEquals("MIN_ROWS")) { lexer.nextToken(); if (lexer.token() == Token.EQ) { @@ -292,7 +292,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); continue; } - + if (identifierEquals("PACK_KEYS")) { lexer.nextToken(); if (lexer.token() == Token.EQ) { @@ -302,7 +302,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); continue; } - + if (identifierEquals("PASSWORD")) { lexer.nextToken(); if (lexer.token() == Token.EQ) { @@ -312,7 +312,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); continue; } - + if (identifierEquals("ROW_FORMAT")) { lexer.nextToken(); if (lexer.token() == Token.EQ) { @@ -323,6 +323,20 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { continue; } + if (identifierEquals("TABLESPACE")) { + lexer.nextToken(); + + String tablespace_name = lexer.stringVal(); + accept(Token.IDENTIFIER); + + if (identifierEquals("STORAGE")) { + throw new ParserException("TODO STORAGE"); + } + + stmt.getTableOptions().put("TABLESPACE", tablespace_name); + continue; + } + if (identifierEquals("TYPE")) { lexer.nextToken(); accept(Token.EQ); @@ -373,7 +387,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { return stmt; } - + private boolean parseTableOptionCharsetOrCollate(MySqlCreateTableStatement stmt) { if (identifierEquals("CHARACTER")) { lexer.nextToken(); @@ -395,7 +409,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); return true; } - + if (identifierEquals("COLLATE")) { lexer.nextToken(); if (lexer.token() == Token.EQ) { @@ -405,7 +419,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); return true; } - + return false; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java index 235acf01ce..f9676cff31 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java @@ -559,6 +559,14 @@ public class MySqlExprParser extends SQLExprParser { accept(Token.LITERAL_CHARS); } + if (identifierEquals("STORAGE")) { + lexer.nextToken(); + SQLExpr expr = expr(); + if (column instanceof MySqlSQLColumnDefinition) { + ((MySqlSQLColumnDefinition) column).setStorage(expr); + } + } + super.parseColumnRest(column); return column; 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 eb5830498c..e182ffc1b9 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 @@ -295,6 +295,11 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV x.getDefaultExpr().accept(this); } } + + if (mysqlColumn != null && mysqlColumn.getStorage() != null) { + print(" STORAGE "); + mysqlColumn.getStorage().accept(this); + } if (mysqlColumn != null && mysqlColumn.getOnUpdate() != null) { print(" ON UPDATE "); @@ -452,8 +457,15 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV for (Map.Entry option : x.getTableOptions().entrySet()) { String key = option.getKey(); - print(" "); + print(' '); print(key); + + if ("TABLESPACE".equals(key)) { + print(' '); + print(option.getValue()); + continue; + } + print(" = "); if ("COMMENT".equals(key)) { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest22.java new file mode 100644 index 0000000000..3af6237efe --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest22.java @@ -0,0 +1,65 @@ +/* + * 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 java.util.List; + +import org.junit.Assert; + +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; +import com.alibaba.druid.stat.TableStat; + +public class MySqlCreateTableTest22 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "CREATE TABLE t1 (" + // + "c1 INT STORAGE DISK," + // + "c2 INT STORAGE MEMORY " + // + ") TABLESPACE ts_1 ENGINE NDB;"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + 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()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(2, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getConditions().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t1"))); + + String output = SQLUtils.toMySqlString(stmt); + Assert.assertEquals("CREATE TABLE t1 (" + // + "\n\tc1 INT STORAGE DISK, " + // + "\n\tc2 INT STORAGE MEMORY" + // + "\n) TABLESPACE ts_1 ENGINE = NDB", output); + + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest23.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest23.java new file mode 100644 index 0000000000..4ff536decb --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest23.java @@ -0,0 +1,64 @@ +/* + * 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 java.util.List; + +import org.junit.Assert; + +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; +import com.alibaba.druid.stat.TableStat; + +public class MySqlCreateTableTest23 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "CREATE TABLE lookup" + // + " (id INT, INDEX USING BTREE (id))" + // + " ENGINE = MEMORY;"; // + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + 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()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(1, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getConditions().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); + + String output = SQLUtils.toMySqlString(stmt); + Assert.assertEquals("CREATE TABLE lookup (" + // + "\n\tid INT, " + // + "\n\tINDEX USING BTREE(id)" + // + "\n) ENGINE = MEMORY", output); + + } +}