From 16f0f0b828ae5d5762de7a09b1e25f5b83ce0baa Mon Sep 17 00:00:00 2001 From: wenshao Date: Thu, 1 Aug 2013 20:07:33 +0800 Subject: [PATCH] bug fixed for mysql parser --- .../mysql/parser/MySqlStatementParser.java | 4 ++ .../sql/mysql/MySqlAlterTableAddIndex_0.java | 3 +- .../sql/mysql/MySqlAlterTableDropIndex_1.java | 3 +- .../sql/mysql/MySqlAlterTableDrop_Test.java | 39 +++++++++++++++++++ 4 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableDrop_Test.java 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 44c08698f6..87e245aec3 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 @@ -2501,6 +2501,10 @@ public class MySqlStatementParser extends SQLStatementParser { SQLAlterTableDropColumnItem item = new SQLAlterTableDropColumnItem(); item.setColumnName(this.exprParser.name()); stmt.getItems().add(item); + } else if (lexer.token() == Token.IDENTIFIER) { + SQLAlterTableDropColumnItem item = new SQLAlterTableDropColumnItem(); + item.setColumnName(this.exprParser.name()); + stmt.getItems().add(item); } else { super.parseAlterDrop(stmt); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableAddIndex_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableAddIndex_0.java index b376240bb5..994712279d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableAddIndex_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableAddIndex_0.java @@ -15,9 +15,10 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; import junit.framework.TestCase; +import org.junit.Assert; + import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableDropIndex_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableDropIndex_1.java index 7b94a8c636..b6e1c08eb8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableDropIndex_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableDropIndex_1.java @@ -15,9 +15,10 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; import junit.framework.TestCase; +import org.junit.Assert; + import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableDrop_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableDrop_Test.java new file mode 100644 index 0000000000..af425c4a8b --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableDrop_Test.java @@ -0,0 +1,39 @@ +/* + * 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 junit.framework.TestCase; + +import org.junit.Assert; + +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.parser.Token; + +public class MySqlAlterTableDrop_Test extends TestCase { + + public void test_alter_first() throws Exception { + String sql = "ALTER TABLE `rules` DROP `enabled`"; + MySqlStatementParser parser = new MySqlStatementParser(sql); + SQLStatement stmt = parser.parseStatementList().get(0); + parser.match(Token.EOF); + String output = SQLUtils.toMySqlString(stmt); + Assert.assertEquals("ALTER TABLE `rules`" // + + "\n\tDROP COLUMN `enabled`", output); + } + +}