diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java index 3ee333c718..ccd1e257a2 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java @@ -873,6 +873,16 @@ public class SQLStatementParser extends SQLParser { lexer.nextToken(); } + stmt.getItems().add(item); + } else if (lexer.token() == Token.LITERAL_ALIAS) { + SQLAlterTableDropColumnItem item = new SQLAlterTableDropColumnItem(); + this.exprParser.names(item.getColumns()); + + if(lexer.token == Token.CASCADE) { + item.setCascade(true); + lexer.nextToken(); + } + stmt.getItems().add(item); } else { throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/GPAlterTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest.java similarity index 94% rename from src/test/java/com/alibaba/druid/bvt/sql/postgresql/GPAlterTableTest.java rename to src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest.java index 6fc9d93933..0aa9aac03a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/GPAlterTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest.java @@ -25,7 +25,7 @@ import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser; import com.alibaba.druid.sql.dialect.postgresql.visitor.PGSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -public class GPAlterTableTest extends PGTest { +public class PGAlterTableTest extends PGTest { public void test_0() throws Exception { String sql = "ALTER TABLE dependencies ALTER COLUMN id TYPE bigint"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest2.java new file mode 100644 index 0000000000..71dcfa0549 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGAlterTableTest2.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.postgresql; + +import java.util.List; + +import org.junit.Assert; + +import com.alibaba.druid.sql.PGTest; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser; +import com.alibaba.druid.sql.dialect.postgresql.visitor.PGSchemaStatVisitor; +import com.alibaba.druid.stat.TableStat; + +public class PGAlterTableTest2 extends PGTest { + + public void test_0() throws Exception { + String sql = "ALTER TABLE \"reviews\" DROP \"review_type\""; + + PGSQLStatementParser parser = new PGSQLStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + PGSchemaStatVisitor visitor = new PGSchemaStatVisitor(); + statemen.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("reviews"))); + + Assert.assertTrue(visitor.getTables().get(new TableStat.Name("reviews")).getAlterCount() == 1); + + Assert.assertTrue(visitor.getColumns().size() == 1); + } + + +}