improve sql parser

src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropFunctionStatement.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.sql.ast.statement;
+
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
+public class SQLDropFunctionStatement extends SQLStatementImpl implements SQLDDLStatement {
+
+    private SQLName name;
+    private boolean ifExists;
+
+    @Override
+    protected void accept0(SQLASTVisitor visitor) {
+        if (visitor.visit(this)) {
+            acceptChild(visitor, name);
+        }
+        visitor.endVisit(this);
+    }
+
+    public SQLName getName() {
+        return name;
+    }
+
+    public void setName(SQLName name) {
+        if (name != null) {
+            name.setParent(this);
+        }
+        this.name = name;
+    }
+
+    public boolean isIfExists() {
+        return ifExists;
+    }
+
+    public void setIfExists(boolean ifExists) {
+        this.ifExists = ifExists;
+    }
+
+}

src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropProcedureStatement.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.sql.ast.statement;
+
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
+public class SQLDropProcedureStatement extends SQLStatementImpl implements SQLDDLStatement {
+
+    private SQLName name;
+    private boolean ifExists;
+
+    @Override
+    protected void accept0(SQLASTVisitor visitor) {
+        if (visitor.visit(this)) {
+            acceptChild(visitor, name);
+        }
+        visitor.endVisit(this);
+    }
+
+    public SQLName getName() {
+        return name;
+    }
+
+    public void setName(SQLName name) {
+        if (name != null) {
+            name.setParent(this);
+        }
+        this.name = name;
+    }
+
+    public boolean isIfExists() {
+        return ifExists;
+    }
+
+    public void setIfExists(boolean ifExists) {
+        this.ifExists = ifExists;
+    }
+
+}

src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTableSpaceStatement.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.sql.ast.statement;
+
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
+public class SQLDropTableSpaceStatement extends SQLStatementImpl implements SQLDDLStatement {
+
+    private SQLName name;
+    private boolean ifExists;
+
+    @Override
+    protected void accept0(SQLASTVisitor visitor) {
+        if (visitor.visit(this)) {
+            acceptChild(visitor, name);
+        }
+        visitor.endVisit(this);
+    }
+
+    public SQLName getName() {
+        return name;
+    }
+
+    public void setName(SQLName name) {
+        if (name != null) {
+            name.setParent(this);
+        }
+        this.name = name;
+    }
+
+    public boolean isIfExists() {
+        return ifExists;
+    }
+
+    public void setIfExists(boolean ifExists) {
+        this.ifExists = ifExists;
+    }
+
+}

src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java

@@ -49,8 +49,11 @@ import com.alibaba.druid.sql.ast.statement.SQLCreateTriggerStatement.TriggerType
 import com.alibaba.druid.sql.ast.statement.SQLCreateViewStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropDatabaseStatement;
+import com.alibaba.druid.sql.ast.statement.SQLDropFunctionStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropIndexStatement;
+import com.alibaba.druid.sql.ast.statement.SQLDropProcedureStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropSequenceStatement;
+import com.alibaba.druid.sql.ast.statement.SQLDropTableSpaceStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropTableStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropTriggerStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropUserStatement;
@@ -190,6 +193,18 @@ public class SQLStatementParser extends SQLParser {
                     SQLStatement stmt = parseDropDatabase(false);
                     statementList.add(stmt);
                     continue;
+                } else if (lexer.token() == Token.FUNCTION) {
+                    SQLStatement stmt = parseDropFunction(false);
+                    statementList.add(stmt);
+                    continue;
+                } else if (lexer.token() == Token.TABLESPACE) {
+                    SQLStatement stmt = parseDropTablespace(false);
+                    statementList.add(stmt);
+                    continue;
+                } else if (lexer.token() == Token.PROCEDURE) {
+                    SQLStatement stmt = parseDropProcedure(false);
+                    statementList.add(stmt);
+                    continue;
                 } else {
                     throw new ParserException("TODO " + lexer.token());
                 }
@@ -871,6 +886,69 @@ public class SQLStatementParser extends SQLParser {
 
         return stmt;
     }
+    
+    protected SQLDropFunctionStatement parseDropFunction(boolean acceptDrop) {
+        if (acceptDrop) {
+            accept(Token.DROP);
+        }
+        
+        SQLDropFunctionStatement stmt = new SQLDropFunctionStatement();
+        
+        accept(Token.FUNCTION);
+        
+        if (lexer.token() == Token.IF) {
+            lexer.nextToken();
+            accept(Token.EXISTS);
+            stmt.setIfExists(true);
+        }
+        
+        SQLName name = this.exprParser.name();
+        stmt.setName(name);
+        
+        return stmt;
+    }
+    
+    protected SQLDropTableSpaceStatement parseDropTablespace(boolean acceptDrop) {
+        if (acceptDrop) {
+            accept(Token.DROP);
+        }
+        
+        SQLDropTableSpaceStatement stmt = new SQLDropTableSpaceStatement();
+        
+        accept(Token.TABLESPACE);
+        
+        if (lexer.token() == Token.IF) {
+            lexer.nextToken();
+            accept(Token.EXISTS);
+            stmt.setIfExists(true);
+        }
+        
+        SQLName name = this.exprParser.name();
+        stmt.setName(name);
+        
+        return stmt;
+    }
+    
+    protected SQLDropProcedureStatement parseDropProcedure(boolean acceptDrop) {
+        if (acceptDrop) {
+            accept(Token.DROP);
+        }
+        
+        SQLDropProcedureStatement stmt = new SQLDropProcedureStatement();
+        
+        accept(Token.PROCEDURE);
+        
+        if (lexer.token() == Token.IF) {
+            lexer.nextToken();
+            accept(Token.EXISTS);
+            stmt.setIfExists(true);
+        }
+        
+        SQLName name = this.exprParser.name();
+        stmt.setName(name);
+        
+        return stmt;
+    }
 
     public SQLStatement parseTruncate() {
         accept(Token.TRUNCATE);

src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java

@@ -96,10 +96,14 @@ import com.alibaba.druid.sql.ast.statement.SQLCreateIndexStatement;
 import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
 import com.alibaba.druid.sql.ast.statement.SQLCreateTriggerStatement;
 import com.alibaba.druid.sql.ast.statement.SQLCreateTriggerStatement.TriggerEvent;
+import com.alibaba.druid.sql.ast.statement.SQLCreateTriggerStatement.TriggerType;
 import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropDatabaseStatement;
+import com.alibaba.druid.sql.ast.statement.SQLDropFunctionStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropIndexStatement;
+import com.alibaba.druid.sql.ast.statement.SQLDropProcedureStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropSequenceStatement;
+import com.alibaba.druid.sql.ast.statement.SQLDropTableSpaceStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropTableStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropTriggerStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropUserStatement;
@@ -111,7 +115,6 @@ import com.alibaba.druid.sql.ast.statement.SQLForeignKeyConstraint;
 import com.alibaba.druid.sql.ast.statement.SQLForeignKeyImpl;
 import com.alibaba.druid.sql.ast.statement.SQLGrantStatement;
 import com.alibaba.druid.sql.ast.statement.SQLInsertStatement;
-import com.alibaba.druid.sql.ast.statement.SQLCreateTriggerStatement.TriggerType;
 import com.alibaba.druid.sql.ast.statement.SQLInsertStatement.ValuesClause;
 import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource;
 import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource.JoinType;
@@ -1787,6 +1790,45 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
 
         return false;
     }
+    
+    @Override
+    public boolean visit(SQLDropFunctionStatement x) {
+        print("DROP FUNCTION ");
+        
+        if (x.isIfExists()) {
+            print("IF EXISTS ");
+        }
+        
+        x.getName().accept(this);
+        
+        return false;
+    }
+    
+    @Override
+    public boolean visit(SQLDropTableSpaceStatement x) {
+        print("DROP TABLESPACE ");
+        
+        if (x.isIfExists()) {
+            print("IF EXISTS ");
+        }
+        
+        x.getName().accept(this);
+        
+        return false;
+    }
+    
+    @Override
+    public boolean visit(SQLDropProcedureStatement x) {
+        print("DROP PROCEDURE ");
+        
+        if (x.isIfExists()) {
+            print("IF EXISTS ");
+        }
+        
+        x.getName().accept(this);
+        
+        return false;
+    }
 
     @Override
     public boolean visit(SQLAlterTableAddIndex x) {

src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java

@@ -81,8 +81,11 @@ import com.alibaba.druid.sql.ast.statement.SQLCreateTriggerStatement;
 import com.alibaba.druid.sql.ast.statement.SQLCreateViewStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropDatabaseStatement;
+import com.alibaba.druid.sql.ast.statement.SQLDropFunctionStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropIndexStatement;
+import com.alibaba.druid.sql.ast.statement.SQLDropProcedureStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropSequenceStatement;
+import com.alibaba.druid.sql.ast.statement.SQLDropTableSpaceStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropTableStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropTriggerStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropUserStatement;
@@ -519,4 +522,16 @@ public interface SQLASTVisitor {
     void endVisit(SQLCreateTriggerStatement x);
 
     boolean visit(SQLCreateTriggerStatement x);
+    
+    void endVisit(SQLDropFunctionStatement x);
+    
+    boolean visit(SQLDropFunctionStatement x);
+    
+    void endVisit(SQLDropTableSpaceStatement x);
+    
+    boolean visit(SQLDropTableSpaceStatement x);
+    
+    void endVisit(SQLDropProcedureStatement x);
+    
+    boolean visit(SQLDropProcedureStatement x);
 }

src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java

@@ -82,8 +82,11 @@ import com.alibaba.druid.sql.ast.statement.SQLCreateTriggerStatement;
 import com.alibaba.druid.sql.ast.statement.SQLCreateViewStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropDatabaseStatement;
+import com.alibaba.druid.sql.ast.statement.SQLDropFunctionStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropIndexStatement;
+import com.alibaba.druid.sql.ast.statement.SQLDropProcedureStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropSequenceStatement;
+import com.alibaba.druid.sql.ast.statement.SQLDropTableSpaceStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropTableStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropTriggerStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropUserStatement;
@@ -1008,4 +1011,34 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor {
     public boolean visit(SQLCreateTriggerStatement x) {
         return true;
     }
+    
+    @Override
+    public void endVisit(SQLDropFunctionStatement x) {
+        
+    }
+    
+    @Override
+    public boolean visit(SQLDropFunctionStatement x) {
+        return true;
+    }
+    
+    @Override
+    public void endVisit(SQLDropTableSpaceStatement x) {
+        
+    }
+    
+    @Override
+    public boolean visit(SQLDropTableSpaceStatement x) {
+        return true;
+    }
+    
+    @Override
+    public void endVisit(SQLDropProcedureStatement x) {
+        
+    }
+    
+    @Override
+    public boolean visit(SQLDropProcedureStatement x) {
+        return true;
+    }
 }

src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java

@@ -56,8 +56,11 @@ import com.alibaba.druid.sql.ast.statement.SQLCreateTriggerStatement;
 import com.alibaba.druid.sql.ast.statement.SQLCreateViewStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropDatabaseStatement;
+import com.alibaba.druid.sql.ast.statement.SQLDropFunctionStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropIndexStatement;
+import com.alibaba.druid.sql.ast.statement.SQLDropProcedureStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropSequenceStatement;
+import com.alibaba.druid.sql.ast.statement.SQLDropTableSpaceStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropTableStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropTriggerStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropUserStatement;
@@ -1292,4 +1295,16 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
     public boolean visit(SQLCreateTriggerStatement x) {
         return false;
     }
+    
+    public boolean visit(SQLDropFunctionStatement x) {
+        return false;
+    }
+    
+    public boolean visit(SQLDropTableSpaceStatement x) {
+        return false;
+    }
+    
+    public boolean visit(SQLDropProcedureStatement x) {
+        return false;
+    }
 }

src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDropFunctionTest.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.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;
+
+public class MySqlDropFunctionTest extends MysqlTest {
+
+    public void test_0() throws Exception {
+        String sql = "DROP FUNCTION function_name";
+
+        MySqlStatementParser parser = new MySqlStatementParser(sql);
+        List<SQLStatement> 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(0, visitor.getTables().size());
+        Assert.assertEquals(0, visitor.getColumns().size());
+        Assert.assertEquals(0, visitor.getConditions().size());
+
+
+//        Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "last_name")));
+    }
+}

src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDropProcedureTest.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.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;
+
+public class MySqlDropProcedureTest extends MysqlTest {
+
+    public void test_0() throws Exception {
+        String sql = "DROP PROCEDURE IF EXISTS sp_name";
+
+        MySqlStatementParser parser = new MySqlStatementParser(sql);
+        List<SQLStatement> 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(0, visitor.getTables().size());
+        Assert.assertEquals(0, visitor.getColumns().size());
+        Assert.assertEquals(0, visitor.getConditions().size());
+
+
+//        Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "last_name")));
+    }
+}

src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDropTablespaceTest.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.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;
+
+public class MySqlDropTablespaceTest extends MysqlTest {
+
+    public void test_0() throws Exception {
+        String sql = "DROP TABLESPACE tablespace_name";
+
+        MySqlStatementParser parser = new MySqlStatementParser(sql);
+        List<SQLStatement> 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(0, visitor.getTables().size());
+        Assert.assertEquals(0, visitor.getColumns().size());
+        Assert.assertEquals(0, visitor.getConditions().size());
+
+
+//        Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "last_name")));
+    }
+}