improve sql parser, support sql server

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

@@ -89,6 +89,7 @@ import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
 import com.alibaba.druid.sql.ast.statement.SQLColumnPrimaryKey;
 import com.alibaba.druid.sql.ast.statement.SQLCommentStatement;
 import com.alibaba.druid.sql.ast.statement.SQLCreateDatabaseStatement;
+import com.alibaba.druid.sql.ast.statement.SQLCreateIndexStatement;
 import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDropIndexStatement;
@@ -97,6 +98,8 @@ import com.alibaba.druid.sql.ast.statement.SQLDropViewStatement;
 import com.alibaba.druid.sql.ast.statement.SQLExprHint;
 import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
 import com.alibaba.druid.sql.ast.statement.SQLInsertStatement;
+import com.alibaba.druid.sql.ast.statement.SQLPrimaryKeyImpl;
+import com.alibaba.druid.sql.ast.statement.SQLUnique;
 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;
@@ -132,12 +135,12 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
     public SQLASTOutputVisitor(Appendable appender){
         this.appender = appender;
     }
-    
+
     public int getParametersSize() {
         if (parameters == null) {
             return 0;
         }
-        
+
         return this.parameters.size();
     }
 
@@ -443,10 +446,10 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
             printAndAccept(x.getArguments(), ", ");
             print(")");
         }
-        
+
         return false;
     }
-    
+
     public boolean visit(SQLCharactorDataType x) {
         visit((SQLDataType) x);
         return false;
@@ -485,7 +488,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
     }
 
     public boolean visit(SQLIntegerExpr x) {
-       return SQLASTOutputVisitorUtils.visit(this, x);
+        return SQLASTOutputVisitorUtils.visit(this, x);
     }
 
     public boolean visit(SQLMethodInvokeExpr x) {
@@ -510,9 +513,9 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
         }
 
         printAndAccept(x.getArguments(), ", ");
-        
+
         visitAggreateRest(x);
-        
+
         print(")");
 
         if (x.getOver() != null) {
@@ -521,9 +524,9 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
         }
         return false;
     }
-    
+
     protected void visitAggreateRest(SQLAggregateExpr aggregateExpr) {
-        
+
     }
 
     public boolean visit(SQLAllColumnExpr x) {
@@ -736,7 +739,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
             print(param.toString());
             return;
         }
-        
+
         if (param instanceof String) {
             SQLCharExpr charExpr = new SQLCharExpr((String) param);
             visit(charExpr);
@@ -762,7 +765,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
             print("'<Blob>");
             return;
         }
-        
+
         if (param instanceof NClob) {
             print("'<NClob>");
             return;
@@ -772,7 +775,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
             print("'<Clob>");
             return;
         }
-        
+
         print("'" + param.getClass().getName() + "'");
     }
 
@@ -1089,13 +1092,13 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
             x.getCondition().accept(this);
             decrementIndent();
         }
-        
+
         if (x.getUsing().size() > 0) {
             print(" USING (");
             printAndAccept(x.getUsing(), ", ");
             print(")");
         }
-        
+
         if (x.getAlias() != null) {
             print(" AS ");
             print(x.getAlias());
@@ -1254,7 +1257,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
     @Override
     public boolean visit(SQLAlterTableDropColumnItem x) {
         print("DROP COLUMN ");
-        x.getColumnName().accept(this);
+        this.printAndAccept(x.getColumns(), ", ");
         return false;
     }
 
@@ -1267,8 +1270,12 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
     public boolean visit(SQLDropIndexStatement x) {
         print("DROP INDEX ");
         x.getIndexName().accept(this);
-        print(" ON ");
-        x.getTableName().accept(this);
+
+        SQLExprTableSource table = x.getTableName();
+        if (table != null) {
+            print(" ON ");
+            table.accept(this);
+        }
         return false;
     }
 
@@ -1343,7 +1350,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
         print(" PRIMARY KEY");
         return false;
     }
-    
+
     @Override
     public boolean visit(SQLColumnCheck x) {
         print("CHECK ");
@@ -1386,14 +1393,14 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
 
         return false;
     }
-    
+
     @Override
     public boolean visit(SQLAlterTableAlterColumn x) {
         print("ALTER COLUMN ");
         x.getColumn().accept(this);
         return false;
     }
-    
+
     @Override
     public boolean visit(SQLCheck x) {
         if (x.getName() != null) {
@@ -1406,58 +1413,58 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
         print(')');
         return false;
     }
-    
+
     @Override
     public boolean visit(SQLAlterTableDropForeinKey x) {
         print("DROP FOREIGN KEY ");
         x.getIndexName().accept(this);
         return false;
     }
-    
+
     @Override
     public boolean visit(SQLAlterTableDropPrimaryKey x) {
         print("DROP PRIMARY KEY");
         return false;
     }
-    
+
     @Override
     public boolean visit(SQLAlterTableEnableKeys x) {
         print("ENABLE KEYS");
         return false;
     }
-    
+
     @Override
     public boolean visit(SQLAlterTableDisableKeys x) {
         print("DISABLE KEYS");
         return false;
     }
-    
+
     @Override
     public boolean visit(SQLAlterTableAddForeignKey x) {
         print("ADD ");
         x.getForeignKey().accept(this);
         return false;
     }
-    
+
     public boolean visit(SQLAlterTableDisableConstraint x) {
         print("DISABLE CONSTRAINT ");
         x.getConstraintName().accept(this);
         return false;
     }
-    
+
     public boolean visit(SQLAlterTableEnableConstraint x) {
         print("ENABLE CONSTRAINT ");
         x.getConstraintName().accept(this);
         return false;
     }
-    
+
     @Override
     public boolean visit(SQLAlterTableDropConstraint x) {
         print("DROP CONSTRAINT ");
         x.getConstraintName().accept(this);
         return false;
     }
-    
+
     @Override
     public boolean visit(SQLAlterTableStatement x) {
         print("ALTER TABLE ");
@@ -1474,10 +1481,56 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
         decrementIndent();
         return false;
     }
-    
+
     @Override
     public boolean visit(SQLExprHint x) {
         x.getExpr().accept(this);
         return false;
     }
+
+    @Override
+    public boolean visit(SQLCreateIndexStatement x) {
+        print("CREATE ");
+        if (x.getType() != null) {
+            print(x.getType());
+            print(" ");
+        }
+
+        print("INDEX ");
+
+        x.getName().accept(this);
+        print(" ON ");
+        x.getTable().accept(this);
+        print(" (");
+        printAndAccept(x.getItems(), ", ");
+        print(")");
+
+        return false;
+    }
+
+    @Override
+    public boolean visit(SQLUnique x) {
+        if (x.getName() != null) {
+            print("CONSTRAINT ");
+            x.getName().accept(this);
+            print(" ");
+        }
+        print("UNIQUE (");
+        printAndAccept(x.getColumns(), ", ");
+        print(")");
+        return false;
+    }
+
+    @Override
+    public boolean visit(SQLPrimaryKeyImpl x) {
+        if (x.getName() != null) {
+            print("CONSTRAINT ");
+            x.getName().accept(this);
+            print(" ");
+        }
+        print("PRIMARY KEY (");
+        printAndAccept(x.getColumns(), ", ");
+        print(")");
+        return false;
+    }
 }

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

@@ -72,6 +72,7 @@ import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
 import com.alibaba.druid.sql.ast.statement.SQLColumnPrimaryKey;
 import com.alibaba.druid.sql.ast.statement.SQLCommentStatement;
 import com.alibaba.druid.sql.ast.statement.SQLCreateDatabaseStatement;
+import com.alibaba.druid.sql.ast.statement.SQLCreateIndexStatement;
 import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
 import com.alibaba.druid.sql.ast.statement.SQLCreateViewStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement;
@@ -82,6 +83,7 @@ import com.alibaba.druid.sql.ast.statement.SQLExprHint;
 import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
 import com.alibaba.druid.sql.ast.statement.SQLInsertStatement;
 import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource;
+import com.alibaba.druid.sql.ast.statement.SQLPrimaryKeyImpl;
 import com.alibaba.druid.sql.ast.statement.SQLReleaseSavePointStatement;
 import com.alibaba.druid.sql.ast.statement.SQLRollbackStatement;
 import com.alibaba.druid.sql.ast.statement.SQLSavePointStatement;
@@ -450,8 +452,17 @@ public interface SQLASTVisitor {
     boolean visit(SQLAlterTableDropConstraint x);
 
     void endVisit(SQLAlterTableDropConstraint x);
-    
+
     boolean visit(SQLUnique x);
 
     void endVisit(SQLUnique x);
+
+    boolean visit(SQLPrimaryKeyImpl x);
+
+    void endVisit(SQLPrimaryKeyImpl x);
+
+    boolean visit(SQLCreateIndexStatement x);
+
+    void endVisit(SQLCreateIndexStatement x);
+
 }

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

@@ -72,6 +72,7 @@ import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
 import com.alibaba.druid.sql.ast.statement.SQLColumnPrimaryKey;
 import com.alibaba.druid.sql.ast.statement.SQLCommentStatement;
 import com.alibaba.druid.sql.ast.statement.SQLCreateDatabaseStatement;
+import com.alibaba.druid.sql.ast.statement.SQLCreateIndexStatement;
 import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
 import com.alibaba.druid.sql.ast.statement.SQLCreateViewStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement;
@@ -83,6 +84,7 @@ import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
 import com.alibaba.druid.sql.ast.statement.SQLInsertStatement;
 import com.alibaba.druid.sql.ast.statement.SQLInsertStatement.ValuesClause;
 import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource;
+import com.alibaba.druid.sql.ast.statement.SQLPrimaryKeyImpl;
 import com.alibaba.druid.sql.ast.statement.SQLReleaseSavePointStatement;
 import com.alibaba.druid.sql.ast.statement.SQLRollbackStatement;
 import com.alibaba.druid.sql.ast.statement.SQLSavePointStatement;
@@ -861,4 +863,24 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor {
     public void endVisit(SQLUnique x) {
         
     }
+
+    @Override
+    public boolean visit(SQLCreateIndexStatement x) {
+        return true;
+    }
+
+    @Override
+    public void endVisit(SQLCreateIndexStatement x) {
+        
+    }
+
+    @Override
+    public boolean visit(SQLPrimaryKeyImpl x) {
+        return true;
+    }
+
+    @Override
+    public void endVisit(SQLPrimaryKeyImpl x) {
+        
+    }
 }

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

@@ -165,10 +165,10 @@ public class SQLEvalVisitorUtils {
             return new PGEvalVisitor();
         }
 
-        if (JdbcUtils.SQL_SERVER.equals(dbType)) {
+        if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) {
             return new SQLServerEvalVisitor();
         }
-        
+
         if (JdbcUtils.DB2.equals(dbType)) {
             return new DB2EvalVisitor();
         }
@@ -1576,11 +1576,11 @@ public class SQLEvalVisitorUtils {
         if (a instanceof Short || b instanceof Short) {
             Short shortA = castToShort(a);
             Short shortB = castToShort(b);
-            
+
             if (shortA == null || shortB == null) {
                 return null;
             }
-            
+
             return shortA * shortB;
         }
 

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

@@ -48,6 +48,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement;
 import com.alibaba.druid.sql.ast.statement.SQLCallStatement;
 import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
 import com.alibaba.druid.sql.ast.statement.SQLCommentStatement;
+import com.alibaba.druid.sql.ast.statement.SQLCreateIndexStatement;
 import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
 import com.alibaba.druid.sql.ast.statement.SQLCreateViewStatement;
 import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement;
@@ -150,38 +151,42 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
     }
 
     private String handleName(String ident) {
-        boolean flag0 = false;
-        boolean flag1 = false;
-        boolean flag2 = false;
-        boolean flag3 = false;
-        for (int i = 0; i < ident.length(); ++i) {
-            final char ch = ident.charAt(i);
-            if (ch == '\"') {
-                flag0 = true;
-            } else if (ch == '`') {
-                flag1 = true;
-            } else if (ch == ' ') {
-                flag2 = true;
-            } else if (ch == '\'') {
-                flag3 = true;
+        int len = ident.length();
+        if (ident.charAt(0) == '[' && ident.charAt(len - 1) == ']') {
+            ident = ident.substring(1, len - 1);
+        } else {
+            boolean flag0 = false;
+            boolean flag1 = false;
+            boolean flag2 = false;
+            boolean flag3 = false;
+            for (int i = 0; i < len; ++i) {
+                final char ch = ident.charAt(i);
+                if (ch == '\"') {
+                    flag0 = true;
+                } else if (ch == '`') {
+                    flag1 = true;
+                } else if (ch == ' ') {
+                    flag2 = true;
+                } else if (ch == '\'') {
+                    flag3 = true;
+                }
+            }
+            if (flag0) {
+                ident = ident.replaceAll("\"", "");
+            }
+
+            if (flag1) {
+                ident = ident.replaceAll("`", "");
+            }
+
+            if (flag2) {
+                ident = ident.replaceAll(" ", "");
+            }
+
+            if (flag3) {
+                ident = ident.replaceAll("'", "");
             }
         }
-        if (flag0) {
-            ident = ident.replaceAll("\"", "");
-        }
-
-        if (flag1) {
-            ident = ident.replaceAll("`", "");
-        }
-
-        if (flag2) {
-            ident = ident.replaceAll(" ", "");
-        }
-
-        if (flag3) {
-            ident = ident.replaceAll("'", "");
-        }
-
         ident = aliasWrap(ident);
 
         return ident;
@@ -1152,28 +1157,59 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
 
         return false;
     }
-    
+
     @Override
     public boolean visit(SQLAlterTableDropConstraint x) {
         return false;
     }
-    
+
     @Override
     public boolean visit(SQLDropIndexStatement x) {
         setMode(x, Mode.DropIndex);
-        SQLName name = (SQLName) x.getTableName().getExpr();
+        SQLExprTableSource table = x.getTableName();
+        if (table != null) {
+            SQLName name = (SQLName) table.getExpr();
 
-        String ident = name.toString();
-        setCurrentTable(ident);
-        
-        TableStat stat = getTableStat(ident);
+            String ident = name.toString();
+            setCurrentTable(ident);
+
+            TableStat stat = getTableStat(ident);
+            stat.incrementDropIndexCount();
+
+            Map<String, String> aliasMap = getAliasMap();
+            if (aliasMap != null) {
+                aliasMap.put(ident, ident);
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean visit(SQLCreateIndexStatement x) {
+        setMode(x, Mode.CreateIndex);
+
+        SQLName name = (SQLName) ((SQLExprTableSource) x.getTable()).getExpr();
+
+        String table = name.toString();
+        setCurrentTable(table);
+
+        TableStat stat = getTableStat(table);
         stat.incrementDropIndexCount();
 
         Map<String, String> aliasMap = getAliasMap();
         if (aliasMap != null) {
-            aliasMap.put(ident, ident);
+            aliasMap.put(table, table);
         }
-        
+
+        for (SQLSelectOrderByItem item : x.getItems()) {
+            SQLExpr expr = item.getExpr();
+            if (expr instanceof SQLIdentifierExpr) {
+                SQLIdentifierExpr identExpr = (SQLIdentifierExpr) expr;
+                String columnName = identExpr.getName();
+                addColumn(table, columnName);
+            }
+        }
+
         return false;
     }
 }