From dce87345a038e4f6733b711c45d3b0615d6b526e Mon Sep 17 00:00:00 2001 From: wenshao Date: Wed, 24 Apr 2013 18:58:34 +0800 Subject: [PATCH] improve mysql ddl parser --- .../statement/MySqlSQLColumnDefinition.java | 11 ++++ .../dialect/mysql/parser/MySqlExprParser.java | 7 +++ .../mysql/visitor/MySqlOutputVisitor.java | 8 ++- .../bvt/sql/mysql/MySqlCreateTableTest17.java | 59 +++++++++++++++++++ 4 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest17.java 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 1f2258ff41..21f4968f7e 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 @@ -15,6 +15,7 @@ */ package com.alibaba.druid.sql.dialect.mysql.ast.statement; +import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; public class MySqlSQLColumnDefinition extends SQLColumnDefinition { @@ -23,6 +24,8 @@ public class MySqlSQLColumnDefinition extends SQLColumnDefinition { private boolean autoIncrement = false; + private SQLExpr onUpdate; + public MySqlSQLColumnDefinition(){ } @@ -35,4 +38,12 @@ public class MySqlSQLColumnDefinition extends SQLColumnDefinition { this.autoIncrement = autoIncrement; } + + public SQLExpr getOnUpdate() { + return onUpdate; + } + + public void setOnUpdate(SQLExpr onUpdate) { + this.onUpdate = onUpdate; + } } 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 5f2163eb22..953ba79fbd 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 @@ -530,6 +530,13 @@ public class MySqlExprParser extends SQLExprParser { } public SQLColumnDefinition parseColumnRest(SQLColumnDefinition column) { + if (lexer.token() == Token.ON) { + lexer.nextToken(); + accept(Token.UPDATE); + SQLExpr expr = this.expr(); + ((MySqlSQLColumnDefinition) column).setOnUpdate(expr); + } + if (identifierEquals("AUTO_INCREMENT")) { lexer.nextToken(); if (column instanceof MySqlSQLColumnDefinition) { 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 53008c5ffc..041cae0c0b 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,7 +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"); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest17.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest17.java new file mode 100644 index 0000000000..e91956c4f9 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest17.java @@ -0,0 +1,59 @@ +/* + * 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 MySqlCreateTableTest17 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "CREATE TABLE t1 (" + // + " ts TIMESTAMP(6) DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6)" + // + ");"; + + 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(1, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getConditions().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("t1"))); + + Assert.assertTrue(visitor.getColumns().contains(new Column("t1", "ts"))); + } +}