refactor mysql & sqlserver parser, merge If/ElseIf/ElseStatement

src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/stmt/SQLServerIfStatement.java

@@ -1,97 +0,0 @@
-/*
- * Copyright 1999-2101 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.dialect.sqlserver.ast.stmt;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.alibaba.druid.sql.ast.SQLExpr;
-import com.alibaba.druid.sql.ast.SQLStatement;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerObjectImpl;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerStatement;
-import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerASTVisitor;
-
-public class SQLServerIfStatement extends SQLServerObjectImpl implements SQLServerStatement {
-
-    private SQLExpr            condition;
-    private List<SQLStatement> statements = new ArrayList<SQLStatement>();
-    private Else               elseItem;
-    private String             dbType;
-
-    @Override
-    public void accept0(SQLServerASTVisitor visitor) {
-        if (visitor.visit(this)) {
-            acceptChild(visitor, condition);
-            acceptChild(visitor, statements);
-            acceptChild(visitor, elseItem);
-        }
-        visitor.endVisit(this);
-    }
-
-    public SQLExpr getCondition() {
-        return condition;
-    }
-
-    public void setCondition(SQLExpr condition) {
-        this.condition = condition;
-    }
-
-    public List<SQLStatement> getStatements() {
-        return statements;
-    }
-
-    public void setStatements(List<SQLStatement> statements) {
-        this.statements = statements;
-    }
-
-    public Else getElseItem() {
-        return elseItem;
-    }
-
-    public void setElseItem(Else elseItem) {
-        this.elseItem = elseItem;
-    }
-
-    public static class Else extends SQLServerObjectImpl {
-
-        private List<SQLStatement> statements = new ArrayList<SQLStatement>();
-
-        @Override
-        public void accept0(SQLServerASTVisitor visitor) {
-            if (visitor.visit(this)) {
-                acceptChild(visitor, statements);
-            }
-            visitor.endVisit(this);
-        }
-
-        public List<SQLStatement> getStatements() {
-            return statements;
-        }
-
-        public void setStatements(List<SQLStatement> statements) {
-            this.statements = statements;
-        }
-
-    }
-
-    public String getDbType() {
-        return dbType;
-    }
-    
-    public void setDbType(String dbType) {
-        this.dbType = dbType;
-    }
-}

src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerStatementParser.java

@@ -28,6 +28,7 @@ import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
 import com.alibaba.druid.sql.ast.statement.SQLConstraint;
 import com.alibaba.druid.sql.ast.statement.SQLInsertInto;
 import com.alibaba.druid.sql.ast.statement.SQLInsertStatement;
+import com.alibaba.druid.sql.ast.statement.SQLIfStatement;
 import com.alibaba.druid.sql.ast.statement.SQLSetStatement;
 import com.alibaba.druid.sql.ast.statement.SQLTableElement;
 import com.alibaba.druid.sql.ast.statement.SQLTableSource;
@@ -39,7 +40,6 @@ import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerBlockStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerCommitStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerDeclareStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerIfStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerInsertStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerRollbackStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerSetStatement;
@@ -449,10 +449,10 @@ public class SQLServerStatementParser extends SQLStatementParser {
         }
     }
     
-    public SQLServerIfStatement parseIf() {
+    public SQLIfStatement parseIf() {
         accept(Token.IF);
 
-        SQLServerIfStatement stmt = new SQLServerIfStatement();
+        SQLIfStatement stmt = new SQLIfStatement();
 
         stmt.setCondition(this.exprParser.expr());
 
@@ -465,7 +465,7 @@ public class SQLServerStatementParser extends SQLStatementParser {
         if (lexer.token() == Token.ELSE) {
             lexer.nextToken();
 
-            SQLServerIfStatement.Else elseItem = new SQLServerIfStatement.Else();
+            SQLIfStatement.Else elseItem = new SQLIfStatement.Else();
             this.parseStatementList(elseItem.getStatements(), 1);
             stmt.setElseItem(elseItem);
         }

src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerASTVisitor.java

@@ -27,8 +27,6 @@ import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerCommitStatement
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerDeclareStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement.SQLServerParameter;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerIfStatement;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerIfStatement.Else;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerInsertStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerRollbackStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerSetStatement;
@@ -91,14 +89,6 @@ public interface SQLServerASTVisitor extends SQLASTVisitor {
 
     void endVisit(SQLServerDeclareStatement x);
     
-    boolean visit(Else x);
-
-    void endVisit(Else x);
-
-    boolean visit(SQLServerIfStatement x);
-
-    void endVisit(SQLServerIfStatement x);
-    
     boolean visit(SQLServerBlockStatement x);
 
     void endVisit(SQLServerBlockStatement x);

src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerASTVisitorAdapter.java

@@ -27,8 +27,6 @@ import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerCommitStatement
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerDeclareStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement.SQLServerParameter;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerIfStatement;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerIfStatement.Else;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerInsertStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerRollbackStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerSetStatement;
@@ -169,26 +167,6 @@ public class SQLServerASTVisitorAdapter extends SQLASTVisitorAdapter implements
 
     }
 
-    @Override
-    public boolean visit(Else x) {
-        return true;
-    }
-
-    @Override
-    public void endVisit(Else x) {
-
-    }
-
-    @Override
-    public boolean visit(SQLServerIfStatement x) {
-        return true;
-    }
-
-    @Override
-    public void endVisit(SQLServerIfStatement x) {
-
-    }
-
     @Override
     public boolean visit(SQLServerBlockStatement x) {
         return true;

src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java

@@ -36,8 +36,6 @@ import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerCommitStatement
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerDeclareStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement.SQLServerParameter;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerIfStatement;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerIfStatement.Else;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerInsertStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerRollbackStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerSetStatement;
@@ -485,58 +483,6 @@ public class SQLServerOutputVisitor extends SQLASTOutputVisitor implements SQLSe
 
     }
 
-    @Override
-    public boolean visit(Else x) {
-        print0(ucase ? "ELSE" : "else");
-        incrementIndent();
-        println();
-
-        for (int i = 0, size = x.getStatements().size(); i < size; ++i) {
-            if (i != 0) {
-                println();
-            }
-            SQLStatement item = x.getStatements().get(i);
-            item.setParent(x);
-            item.accept(this);
-        }
-
-        decrementIndent();
-        return false;
-    }
-
-    @Override
-    public void endVisit(Else x) {
-
-    }
-
-    @Override
-    public boolean visit(SQLServerIfStatement x) {
-        print0(ucase ? "IF " : "if ");
-        x.getCondition().accept(this);
-        incrementIndent();
-        println();
-        for (int i = 0, size = x.getStatements().size(); i < size; ++i) {
-            SQLStatement item = x.getStatements().get(i);
-            item.setParent(x);
-            item.accept(this);
-            if (i != size - 1) {
-                println();
-            }
-        }
-        decrementIndent();
-
-        if (x.getElseItem() != null) {
-            println();
-            x.getElseItem().accept(this);
-        }
-        return false;
-    }
-
-    @Override
-    public void endVisit(SQLServerIfStatement x) {
-
-    }
-
     @Override
     public boolean visit(SQLServerBlockStatement x) {
         print0(ucase ? "BEGIN" : "begin");

src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerSchemaStatVisitor.java

@@ -34,8 +34,6 @@ import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerCommitStatement
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerDeclareStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement.SQLServerParameter;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerIfStatement;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerIfStatement.Else;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerInsertStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerRollbackStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerSetStatement;
@@ -205,26 +203,6 @@ public class SQLServerSchemaStatVisitor extends SchemaStatVisitor implements SQL
 
     }
 
-    @Override
-    public boolean visit(Else x) {
-        return true;
-    }
-
-    @Override
-    public void endVisit(Else x) {
-
-    }
-
-    @Override
-    public boolean visit(SQLServerIfStatement x) {
-        return true;
-    }
-
-    @Override
-    public void endVisit(SQLServerIfStatement x) {
-
-    }
-
     @Override
     public boolean visit(SQLServerBlockStatement x) {
         return true;