From cdc9a6d49fc0726c4302fd20c1065fb63962a1e9 Mon Sep 17 00:00:00 2001 From: wenshao Date: Wed, 20 Mar 2013 01:11:08 +0800 Subject: [PATCH] improve mysql ddl parser support --- .../statement/SQLAlterTableAlterColumn.java | 44 +++++++++++++++++++ .../mysql/parser/MySqlStatementParser.java | 12 ++++- .../sql/visitor/SQLASTOutputVisitor.java | 8 ++++ .../druid/sql/visitor/SQLASTVisitor.java | 35 ++++++++------- .../sql/visitor/SQLASTVisitorAdapter.java | 11 +++++ .../bvt/sql/mysql/MySqlAlterTableTest5.java | 8 ++-- 6 files changed, 98 insertions(+), 20 deletions(-) create mode 100644 src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAlterColumn.java diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAlterColumn.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAlterColumn.java new file mode 100644 index 0000000000..a2c2de7ab9 --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAlterColumn.java @@ -0,0 +1,44 @@ +/* + * 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.sql.ast.statement; + +import com.alibaba.druid.sql.ast.SQLObjectImpl; +import com.alibaba.druid.sql.visitor.SQLASTVisitor; + +public class SQLAlterTableAlterColumn extends SQLObjectImpl implements SQLAlterTableItem { + + private static final long serialVersionUID = 1L; + + private SQLColumnDefinition column; + + @Override + protected void accept0(SQLASTVisitor visitor) { + if (visitor.visit(this)) { + acceptChild(visitor, column); + } + visitor.endVisit(this); + } + + public SQLColumnDefinition getColumn() { + return column; + } + + public void setColumn(SQLColumnDefinition column) { + this.column = column; + } + +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java index 68d44d2f18..cfa1958973 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java @@ -30,6 +30,7 @@ import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr; import com.alibaba.druid.sql.ast.expr.SQLQueryExpr; import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddPrimaryKey; +import com.alibaba.druid.sql.ast.statement.SQLAlterTableAlterColumn; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropColumnItem; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropIndex; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; @@ -2213,7 +2214,16 @@ public class MySqlStatementParser extends SQLStatementParser { stmt.getItems().add(item); } } else if (lexer.token() == Token.ALTER) { - throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal()); + lexer.nextToken(); + if (identifierEquals("COLUMN")) { + lexer.nextToken(); + } + + SQLAlterTableAlterColumn alterColumn = new SQLAlterTableAlterColumn(); + SQLColumnDefinition columnDef = this.exprParser.parseColumn(); + alterColumn.setColumn(columnDef); + + stmt.getItems().add(alterColumn); } else if (identifierEquals("CHANGE")) { lexer.nextToken(); if (identifierEquals("COLUMN")) { diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java index 6073bfe383..86b5d909fa 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -67,6 +67,7 @@ import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; import com.alibaba.druid.sql.ast.statement.NotNullConstraint; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddColumn; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddPrimaryKey; +import com.alibaba.druid.sql.ast.statement.SQLAlterTableAlterColumn; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropColumnItem; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropIndex; import com.alibaba.druid.sql.ast.statement.SQLAssignItem; @@ -1353,4 +1354,11 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter { return false; } + + @Override + public boolean visit(SQLAlterTableAlterColumn x) { + print("ALTER COLUMN "); + x.getColumn().accept(this); + return false; + } } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java index 2f00b9d368..6ce1e05b40 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java @@ -55,6 +55,7 @@ import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; import com.alibaba.druid.sql.ast.statement.NotNullConstraint; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddColumn; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddPrimaryKey; +import com.alibaba.druid.sql.ast.statement.SQLAlterTableAlterColumn; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropColumnItem; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropIndex; import com.alibaba.druid.sql.ast.statement.SQLAssignItem; @@ -251,7 +252,7 @@ public interface SQLASTVisitor { boolean visit(SQLDataType x); void endVisit(SQLDataType x); - + boolean visit(SQLCharactorDataType x); void endVisit(SQLCharactorDataType x); @@ -363,13 +364,13 @@ public interface SQLASTVisitor { boolean visit(SQLAlterTableDropColumnItem x); void endVisit(SQLAlterTableDropColumnItem x); - + boolean visit(SQLAlterTableDropIndex x); - + void endVisit(SQLAlterTableDropIndex x); - + boolean visit(SQLAlterTableAddPrimaryKey x); - + void endVisit(SQLAlterTableAddPrimaryKey x); boolean visit(SQLDropIndexStatement x); @@ -399,24 +400,28 @@ public interface SQLASTVisitor { void endVisit(SQLCreateDatabaseStatement x); boolean visit(SQLCreateDatabaseStatement x); - + void endVisit(SQLOver x); - + boolean visit(SQLOver x); - + void endVisit(SQLColumnPrimaryKey x); - + boolean visit(SQLColumnPrimaryKey x); - + void endVisit(SQLColumnUniqueIndex x); - + boolean visit(SQLColumnUniqueIndex x); - + void endVisit(SQLWithSubqueryClause x); - + boolean visit(SQLWithSubqueryClause x); - + void endVisit(SQLWithSubqueryClause.Entry x); - + boolean visit(SQLWithSubqueryClause.Entry x); + + void endVisit(SQLAlterTableAlterColumn x); + + boolean visit(SQLAlterTableAlterColumn x); } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java index dcdfe83975..202ff4d4d1 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java @@ -55,6 +55,7 @@ import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; import com.alibaba.druid.sql.ast.statement.NotNullConstraint; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddColumn; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddPrimaryKey; +import com.alibaba.druid.sql.ast.statement.SQLAlterTableAlterColumn; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropColumnItem; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropIndex; import com.alibaba.druid.sql.ast.statement.SQLAssignItem; @@ -765,4 +766,14 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor { public void endVisit(SQLCharactorDataType x) { } + + @Override + public void endVisit(SQLAlterTableAlterColumn x) { + + } + + @Override + public boolean visit(SQLAlterTableAlterColumn x) { + return true; + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest5.java index 231c989850..420093f634 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest5.java @@ -42,12 +42,12 @@ public class MySqlAlterTableTest5 extends TestCase { System.out.println("orderBy : " + visitor.getOrderByColumns()); String output = SQLUtils.toMySqlString(stmt); - Assert.assertEquals("ALTER TABLE test" + // - "\n\tADD COLUMN dspcode char(200)", output); - + Assert.assertEquals("ALTER TABLE table_name" + // + "\n\tALTER COLUMN column_name char(50)", output); + Assert.assertEquals(1, visitor.getTables().size()); Assert.assertEquals(1, visitor.getColumns().size()); - Assert.assertTrue(visitor.getColumns().contains(new Column("test", "dspcode"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("table_name", "column_name"))); } }