ameterizedOutputVisitorTest_6.java

src/main/java/com/alibaba/druid/sql/dialect/db2/ast/DB2StatementImpl.java

@@ -18,8 +18,14 @@ package com.alibaba.druid.sql.dialect.db2.ast;
 import com.alibaba.druid.sql.ast.SQLStatementImpl;
 import com.alibaba.druid.sql.dialect.db2.visitor.DB2ASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public abstract class DB2StatementImpl extends SQLStatementImpl implements DB2Object {
+
+    public DB2StatementImpl() {
+        super(JdbcConstants.DB2);
+    }
+
     @Override
     protected void accept0(SQLASTVisitor visitor) {
         if (visitor instanceof DB2ASTVisitor) {

src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableStatement.java

@@ -18,10 +18,15 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
 import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement;
 import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class MySqlAlterTableStatement extends SQLAlterTableStatement {
 
     private boolean ignore = false;
+    
+    public MySqlAlterTableStatement() {
+        super (JdbcConstants.MYSQL);
+    }
 
     @Override
     protected void accept0(SQLASTVisitor visitor) {

src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateIndexStatement.java

@@ -18,10 +18,15 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
 import com.alibaba.druid.sql.ast.statement.SQLCreateIndexStatement;
 import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class MySqlCreateIndexStatement extends SQLCreateIndexStatement implements MySqlStatement {
 
     private String using;
+    
+    public MySqlCreateIndexStatement() {
+        super (JdbcConstants.MYSQL);
+    }
 
     public String getUsing() {
         return using;

src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatement.java

@@ -31,11 +31,10 @@ import com.alibaba.druid.sql.ast.statement.SQLSelect;
 import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl;
 import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class MySqlCreateTableStatement extends SQLCreateTableStatement implements MySqlStatement {
 
-    private boolean                ifNotExiists = false;
-
     private Map<String, SQLObject> tableOptions = new LinkedHashMap<String, SQLObject>();
 
     protected SQLSelect            query;
@@ -49,7 +48,7 @@ public class MySqlCreateTableStatement extends SQLCreateTableStatement implement
     private SQLExprTableSource     like;
 
     public MySqlCreateTableStatement(){
-
+        super (JdbcConstants.MYSQL);
     }
 
     public SQLExprTableSource getLike() {
@@ -99,14 +98,6 @@ public class MySqlCreateTableStatement extends SQLCreateTableStatement implement
         this.query = query;
     }
 
-    public boolean isIfNotExiists() {
-        return ifNotExiists;
-    }
-
-    public void setIfNotExiists(boolean ifNotExiists) {
-        this.ifNotExiists = ifNotExiists;
-    }
-
     @Override
     protected void accept0(SQLASTVisitor visitor) {
         if (visitor instanceof MySqlASTVisitor) {

src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlDeleteStatement.java

@@ -22,6 +22,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock.L
 import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
 import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class MySqlDeleteStatement extends SQLDeleteStatement {
 
@@ -33,6 +34,10 @@ public class MySqlDeleteStatement extends SQLDeleteStatement {
     private SQLTableSource using;
     private SQLOrderBy     orderBy;
     private Limit          limit;
+    
+    public MySqlDeleteStatement() {
+        super (JdbcConstants.MYSQL);
+    }
 
     public boolean isLowPriority() {
         return lowPriority;

src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlRollbackStatement.java

@@ -19,6 +19,7 @@ import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.statement.SQLRollbackStatement;
 import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class MySqlRollbackStatement extends SQLRollbackStatement implements MySqlStatement {
 
@@ -28,7 +29,7 @@ public class MySqlRollbackStatement extends SQLRollbackStatement implements MySq
     private SQLExpr force;
 
     public MySqlRollbackStatement(){
-
+        super (JdbcConstants.MYSQL);
     }
 
     public Boolean getChain() {

src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlStatementImpl.java

@@ -18,9 +18,14 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
 import com.alibaba.druid.sql.ast.SQLStatementImpl;
 import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public abstract class MySqlStatementImpl extends SQLStatementImpl implements MySqlStatement {
 
+    public MySqlStatementImpl() {
+        super(JdbcConstants.MYSQL);
+    }
+
     @Override
     protected void accept0(SQLASTVisitor visitor) {
         if (visitor instanceof MySqlASTVisitor) {

src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlUpdateStatement.java

@@ -20,6 +20,7 @@ import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock.Limit;
 import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class MySqlUpdateStatement extends SQLUpdateStatement implements MySqlStatement {
 
@@ -28,6 +29,10 @@ public class MySqlUpdateStatement extends SQLUpdateStatement implements MySqlSta
 
     private boolean    lowPriority = false;
     private boolean    ignore      = false;
+    
+    public MySqlUpdateStatement() {
+        super (JdbcConstants.MYSQL);
+    }
 
     public Limit getLimit() {
         return limit;

src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java

@@ -22,6 +22,7 @@ import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
 import com.alibaba.druid.sql.ast.statement.SQLForeignKeyConstraint;
 import com.alibaba.druid.sql.ast.statement.SQLSelect;
 import com.alibaba.druid.sql.ast.statement.SQLTableConstraint;
+import com.alibaba.druid.sql.ast.statement.SQLTableSource;
 import com.alibaba.druid.sql.dialect.mysql.ast.MySqlKey;
 import com.alibaba.druid.sql.dialect.mysql.ast.MySqlPrimaryKey;
 import com.alibaba.druid.sql.dialect.mysql.ast.MySqlUnique;
@@ -338,6 +339,29 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
                 stmt.getTableOptions().put("STATS_PERSISTENT", this.exprParser.expr());
                 continue;
             }
+            
+            if (identifierEquals("STATS_SAMPLE_PAGES")) {
+                lexer.nextToken();
+                if (lexer.token() == Token.EQ) {
+                    lexer.nextToken();
+                }
+
+                stmt.getTableOptions().put("STATS_SAMPLE_PAGES", this.exprParser.expr());
+                continue;
+            }
+            
+            if (lexer.token() == Token.UNION) {
+                lexer.nextToken();
+                if (lexer.token() == Token.EQ) {
+                    lexer.nextToken();
+                }
+
+                accept(Token.LPAREN);
+                SQLTableSource tableSrc = this.createSQLSelectParser().parseTableSource();
+                stmt.getTableOptions().put("UNION", tableSrc);
+                accept(Token.RPAREN);
+                continue;
+            }
 
             if (lexer.token() == Token.TABLESPACE) {
                 lexer.nextToken();

src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java

@@ -147,6 +147,7 @@ import com.alibaba.druid.sql.parser.ParserException;
 import com.alibaba.druid.sql.parser.SQLSelectParser;
 import com.alibaba.druid.sql.parser.SQLStatementParser;
 import com.alibaba.druid.sql.parser.Token;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class MySqlStatementParser extends SQLStatementParser {
 
@@ -191,7 +192,7 @@ public class MySqlStatementParser extends SQLStatementParser {
 
     public SQLSelectStatement parseSelect() {
         MySqlSelectParser selectParser = new MySqlSelectParser(this.exprParser);
-        return new SQLSelectStatement(selectParser.select());
+        return new SQLSelectStatement(selectParser.select(), JdbcConstants.MYSQL);
     }
 
     public SQLUpdateStatement parseUpdateStatement() {
@@ -2131,7 +2132,7 @@ public class MySqlStatementParser extends SQLStatementParser {
             }
             return stmt;
         } else {
-            SQLSetStatement stmt = new SQLSetStatement();
+            SQLSetStatement stmt = new SQLSetStatement(getDbType());
 
             parseAssignItems(stmt.getItems(), stmt);
 
@@ -2375,6 +2376,11 @@ public class MySqlStatementParser extends SQLStatementParser {
                     throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
                 } else if (identifierEquals("REMOVE")) {
                     throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
+                } else if (identifierEquals("ALGORITHM")) {
+                    lexer.nextToken();
+                    accept(Token.EQ);
+                    stmt.getItems().add(new MySqlAlterTableOption("ALGORITHM", lexer.stringVal()));
+                    lexer.nextToken();
                 } else if (identifierEquals(ENGINE)) {
                     lexer.nextToken();
                     accept(Token.EQ);
@@ -2531,7 +2537,7 @@ public class MySqlStatementParser extends SQLStatementParser {
 
         accept(Token.DATABASE);
 
-        SQLCreateDatabaseStatement stmt = new SQLCreateDatabaseStatement();
+        SQLCreateDatabaseStatement stmt = new SQLCreateDatabaseStatement(JdbcConstants.MYSQL);
         stmt.setName(this.exprParser.name());
 
         if (lexer.token() == Token.DEFAULT) {

src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java

@@ -479,6 +479,11 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
                 print(' ');
                 option.getValue().accept(this);
                 continue;
+            } else if ("UNION".equals(key)) {
+                print(" = (");
+                option.getValue().accept(this);
+                print(')');
+                continue;
             }
 
             print(" = ");

src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java

@@ -27,6 +27,7 @@ import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
 import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
 import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
 import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
+import com.alibaba.druid.sql.ast.statement.SQLTableSource;
 import com.alibaba.druid.sql.ast.statement.SQLUnionQuery;
 import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.MySqlForceIndexHint;
@@ -1157,7 +1158,15 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS
 
     @Override
     public boolean visit(MySqlCreateTableStatement x) {
-        return super.visit((SQLCreateTableStatement) x);
+        boolean val = super.visit((SQLCreateTableStatement) x);
+
+        for (SQLObject option : x.getTableOptions().values()) {
+            if (option instanceof SQLTableSource) {
+                option.accept(this);
+            }
+        }
+
+        return val;
     }
 
     @Override
@@ -1342,7 +1351,7 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS
 
     @Override
     public void endVisit(MySqlHintStatement x) {
-        
+
     }
 
     @Override

src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsCreateTableStatement.java

@@ -25,23 +25,20 @@ import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
 import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
 import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class OdpsCreateTableStatement extends SQLCreateTableStatement {
 
-    private boolean                     ifNotExiists     = false;
-
     private SQLExprTableSource          like;
 
     protected SQLExpr                   comment;
 
     protected List<SQLColumnDefinition> partitionColumns = new ArrayList<SQLColumnDefinition>(2);
 
-    public boolean isIfNotExiists() {
-        return ifNotExiists;
-    }
-
-    public void setIfNotExiists(boolean ifNotExiists) {
-        this.ifNotExiists = ifNotExiists;
+    protected SQLExpr                   lifecycle;
+    
+    public OdpsCreateTableStatement() {
+        super (JdbcConstants.ODPS);
     }
 
     public SQLExprTableSource getLike() {
@@ -67,7 +64,15 @@ public class OdpsCreateTableStatement extends SQLCreateTableStatement {
     public List<SQLColumnDefinition> getPartitionColumns() {
         return partitionColumns;
     }
-    
+
+    public SQLExpr getLifecycle() {
+        return lifecycle;
+    }
+
+    public void setLifecycle(SQLExpr lifecycle) {
+        this.lifecycle = lifecycle;
+    }
+
     @Override
     protected void accept0(SQLASTVisitor visitor) {
         accept0((OdpsASTVisitor) visitor);
@@ -78,7 +83,9 @@ public class OdpsCreateTableStatement extends SQLCreateTableStatement {
             this.acceptChild(visitor, tableSource);
             this.acceptChild(visitor, tableElementList);
             this.acceptChild(visitor, partitionColumns);
+            this.acceptChild(visitor, lifecycle);
         }
         visitor.endVisit(this);
-    }    
+    }
+
 }

src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsInsertStatement.java

@@ -23,12 +23,17 @@ import com.alibaba.druid.sql.ast.SQLStatementImpl;
 import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource;
 import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class OdpsInsertStatement extends SQLStatementImpl implements SQLStatement {
 
     private SQLSubqueryTableSource from;
 
     private List<OdpsInsert>       items = new ArrayList<OdpsInsert>();
+    
+    public OdpsInsertStatement() {
+        super (JdbcConstants.ODPS);
+    }
 
     public void setFrom(SQLSubqueryTableSource from) {
         this.from = from;

src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsShowPartitionsStmt.java

@@ -0,0 +1,37 @@
+package com.alibaba.druid.sql.dialect.odps.ast;
+
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
+import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
+import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
+
+public class OdpsShowPartitionsStmt extends SQLStatementImpl implements SQLStatement {
+
+    private SQLExprTableSource tableSource;
+    
+    public OdpsShowPartitionsStmt() {
+        super (JdbcConstants.ODPS);
+    }
+
+    public SQLExprTableSource getTableSource() {
+        return tableSource;
+    }
+
+    public void setTableSource(SQLExprTableSource tableSource) {
+        this.tableSource = tableSource;
+    }
+
+    @Override
+    protected void accept0(SQLASTVisitor visitor) {
+        accept0((OdpsASTVisitor) visitor);
+    }
+    
+    protected void accept0(OdpsASTVisitor visitor) {
+        if (visitor.visit(this)) {
+            acceptChild(visitor, tableSource);
+        }
+        visitor.endVisit(this);
+    }
+}

src/main/java/com/alibaba/druid/sql/dialect/odps/ast/OdpsShowStatisticStmt.java

@@ -0,0 +1,37 @@
+package com.alibaba.druid.sql.dialect.odps.ast;
+
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
+import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
+import com.alibaba.druid.sql.dialect.odps.visitor.OdpsASTVisitor;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
+
+public class OdpsShowStatisticStmt extends SQLStatementImpl implements SQLStatement {
+
+    private SQLExprTableSource tableSource;
+    
+    public OdpsShowStatisticStmt() {
+        super (JdbcConstants.ODPS);
+    }
+
+    public SQLExprTableSource getTableSource() {
+        return tableSource;
+    }
+
+    public void setTableSource(SQLExprTableSource tableSource) {
+        this.tableSource = tableSource;
+    }
+
+    @Override
+    protected void accept0(SQLASTVisitor visitor) {
+        accept0((OdpsASTVisitor) visitor);
+    }
+    
+    protected void accept0(OdpsASTVisitor visitor) {
+        if (visitor.visit(this)) {
+            acceptChild(visitor, tableSource);
+        }
+        visitor.endVisit(this);
+    }
+}

src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsCreateTableParser.java

@@ -105,6 +105,11 @@ public class OdpsCreateTableParser extends SQLCreateTableParser {
             accept(Token.RPAREN);
         }
         
+        if (identifierEquals("LIFECYCLE")) {
+            lexer.nextToken();
+            stmt.setLifecycle(this.exprParser.expr());
+        }
+        
         return stmt;
     }
 }

src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsLexer.java

@@ -34,6 +34,7 @@ public class OdpsLexer extends Lexer {
 
         map.putAll(Keywords.DEFAULT_KEYWORDS.getKeywords());
         
+        map.put("SHOW", Token.SHOW);
         map.put("PARTITION", Token.PARTITION);
         map.put("PARTITIONED", Token.PARTITIONED);
         map.put("OVERWRITE", Token.OVERWRITE);

src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsStatementParser.java

@@ -21,10 +21,14 @@ import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.SQLStatement;
 import com.alibaba.druid.sql.ast.statement.SQLAssignItem;
 import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
+import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
 import com.alibaba.druid.sql.ast.statement.SQLSelect;
 import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsInsert;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsInsertStatement;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsShowPartitionsStmt;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsShowStatisticStmt;
+import com.alibaba.druid.sql.parser.ParserException;
 import com.alibaba.druid.sql.parser.SQLCreateTableParser;
 import com.alibaba.druid.sql.parser.SQLExprParser;
 import com.alibaba.druid.sql.parser.SQLSelectParser;
@@ -134,4 +138,31 @@ public class OdpsStatementParser extends SQLStatementParser {
         return insert;
     }
 
+    public SQLStatement parseShow() {
+        accept(Token.SHOW);
+        
+        if (identifierEquals("PARTITIONS")) {
+            lexer.nextToken();
+            
+            OdpsShowPartitionsStmt stmt = new OdpsShowPartitionsStmt();
+            
+            SQLExpr expr = this.exprParser.expr();
+            stmt.setTableSource(new SQLExprTableSource(expr));
+            
+            return stmt;
+        }
+        
+        if (identifierEquals("STATISTIC")) {
+            lexer.nextToken();
+            
+            OdpsShowStatisticStmt stmt = new OdpsShowStatisticStmt();
+            
+            SQLExpr expr = this.exprParser.expr();
+            stmt.setTableSource(new SQLExprTableSource(expr));
+            
+            return stmt;
+        }
+        throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
+    }
+
 }

src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsASTVisitor.java

@@ -18,6 +18,8 @@ package com.alibaba.druid.sql.dialect.odps.visitor;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsCreateTableStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsInsert;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsInsertStatement;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsShowPartitionsStmt;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsShowStatisticStmt;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsUDTFSQLSelectItem;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
@@ -38,4 +40,12 @@ public interface OdpsASTVisitor extends SQLASTVisitor {
     void endVisit(OdpsUDTFSQLSelectItem x);
     
     boolean visit(OdpsUDTFSQLSelectItem x);
+    
+    void endVisit(OdpsShowPartitionsStmt x);
+    
+    boolean visit(OdpsShowPartitionsStmt x);
+    
+    void endVisit(OdpsShowStatisticStmt x);
+    
+    boolean visit(OdpsShowStatisticStmt x);
 }

src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsOutputVisitor.java

@@ -29,6 +29,8 @@ import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsCreateTableStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsInsert;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsInsertStatement;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsShowPartitionsStmt;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsShowStatisticStmt;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsUDTFSQLSelectItem;
 import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor;
 
@@ -89,6 +91,12 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
             }
             print(")");
         }
+        
+        if (x.getLifecycle() != null) {
+            println();
+            print("LIFECYCLE ");
+            x.getLifecycle().accept(this);
+        }
 
         return false;
     }
@@ -299,4 +307,28 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
 
         return false;
     }
+
+    @Override
+    public void endVisit(OdpsShowPartitionsStmt x) {
+        
+    }
+
+    @Override
+    public boolean visit(OdpsShowPartitionsStmt x) {
+        print("SHOW PARTITIONS ");
+        x.getTableSource().accept(this);
+        return false;
+    }
+    
+    @Override
+    public void endVisit(OdpsShowStatisticStmt x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsShowStatisticStmt x) {
+        print("SHOW STATISTIC ");
+        x.getTableSource().accept(this);
+        return false;
+    }
 }

src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsSchemaStatVisitor.java

@@ -19,6 +19,8 @@ import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsCreateTableStatement;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsInsert;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsInsertStatement;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsShowPartitionsStmt;
+import com.alibaba.druid.sql.dialect.odps.ast.OdpsShowStatisticStmt;
 import com.alibaba.druid.sql.dialect.odps.ast.OdpsUDTFSQLSelectItem;
 import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
 
@@ -65,5 +67,25 @@ public class OdpsSchemaStatVisitor extends SchemaStatVisitor implements OdpsASTV
         return true;
     }
 
+    @Override
+    public void endVisit(OdpsShowPartitionsStmt x) {
+        
+    }
+
+    @Override
+    public boolean visit(OdpsShowPartitionsStmt x) {
+        return true;
+    }
+    
+    @Override
+    public void endVisit(OdpsShowStatisticStmt x) {
+        
+    }
+    
+    @Override
+    public boolean visit(OdpsShowStatisticStmt x) {
+        return true;
+    }
+
     
 }

src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableStatement.java

@@ -18,11 +18,16 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt;
 import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement;
 import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class OracleAlterTableStatement extends SQLAlterTableStatement implements OracleDDLStatement {
 
     private boolean updateGlobalIndexes     = false;
     private boolean invalidateGlobalIndexes = false;
+    
+    public OracleAlterTableStatement() {
+        super (JdbcConstants.ORACLE);
+    }
 
     protected void accept0(SQLASTVisitor visitor) {
         accept0((OracleASTVisitor) visitor);

src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateIndexStatement.java

@@ -20,6 +20,7 @@ import com.alibaba.druid.sql.ast.SQLName;
 import com.alibaba.druid.sql.ast.statement.SQLCreateIndexStatement;
 import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class OracleCreateIndexStatement extends SQLCreateIndexStatement implements OracleDDLStatement {
 
@@ -41,6 +42,10 @@ public class OracleCreateIndexStatement extends SQLCreateIndexStatement implemen
     private Boolean enable            = null;
 
     private boolean computeStatistics = false;
+    
+    public OracleCreateIndexStatement() {
+        super (JdbcConstants.ORACLE);
+    }
 
     public SQLName getTablespace() {
         return tablespace;

src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleCreateTableStatement.java

@@ -24,6 +24,7 @@ import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleLobStorageClause;
 import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleStorageClause;
 import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class OracleCreateTableStatement extends SQLCreateTableStatement implements OracleDDLStatement {
 
@@ -58,6 +59,10 @@ public class OracleCreateTableStatement extends SQLCreateTableStatement implemen
     private SQLPartitioningClause   partitioning;
 
     private DeferredSegmentCreation deferredSegmentCreation;
+    
+    public OracleCreateTableStatement() {
+        super (JdbcConstants.ORACLE);
+    }
 
     public OracleLobStorageClause getLobStorage() {
         return lobStorage;

src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDeleteStatement.java

@@ -23,6 +23,7 @@ import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement;
 import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleReturningClause;
 import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class OracleDeleteStatement extends SQLDeleteStatement {
 
@@ -32,7 +33,7 @@ public class OracleDeleteStatement extends SQLDeleteStatement {
     private OracleReturningClause returning = null;
 
     public OracleDeleteStatement(){
-
+        super (JdbcConstants.ORACLE);
     }
 
     public OracleReturningClause getReturning() {

src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleExplainStatement.java

@@ -21,11 +21,16 @@ import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
 import com.alibaba.druid.sql.ast.statement.SQLExplainStatement;
 import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class OracleExplainStatement extends SQLExplainStatement implements OracleStatement {
 
     private SQLCharExpr statementId;
     private SQLExpr     into;
+    
+    public OracleExplainStatement() {
+        super (JdbcConstants.ORACLE);
+    }
 
     @Override
     public void accept0(OracleASTVisitor visitor) {

src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleStatementImpl.java

@@ -19,8 +19,13 @@ import com.alibaba.druid.sql.SQLUtils;
 import com.alibaba.druid.sql.ast.SQLStatementImpl;
 import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public abstract class OracleStatementImpl extends SQLStatementImpl implements OracleStatement {
+    
+    public OracleStatementImpl() {
+        super(JdbcConstants.ORACLE);
+    }
 
     protected void accept0(SQLASTVisitor visitor) {
         accept0((OracleASTVisitor) visitor);

src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleUpdateStatement.java

@@ -23,6 +23,7 @@ import com.alibaba.druid.sql.ast.SQLHint;
 import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement;
 import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class OracleUpdateStatement extends SQLUpdateStatement implements OracleStatement {
 
@@ -35,7 +36,7 @@ public class OracleUpdateStatement extends SQLUpdateStatement implements OracleS
     private List<SQLExpr>       returningInto = new ArrayList<SQLExpr>();
 
     public OracleUpdateStatement(){
-
+        super (JdbcConstants.ORACLE);
     }
 
     public List<SQLExpr> getReturning() {

src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java

@@ -105,6 +105,7 @@ import com.alibaba.druid.sql.parser.Lexer;
 import com.alibaba.druid.sql.parser.ParserException;
 import com.alibaba.druid.sql.parser.SQLStatementParser;
 import com.alibaba.druid.sql.parser.Token;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class OracleStatementParser extends SQLStatementParser {
 
@@ -163,7 +164,8 @@ public class OracleStatementParser extends SQLStatementParser {
             }
 
             if (lexer.token() == (Token.SELECT)) {
-                statementList.add(new SQLSelectStatement(new OracleSelectParser(this.exprParser).select()));
+                SQLSelectStatement stmt = new SQLSelectStatement(new OracleSelectParser(this.exprParser).select(), JdbcConstants.ORACLE); 
+                statementList.add(stmt);
                 continue;
             }
 
@@ -238,7 +240,7 @@ public class OracleStatementParser extends SQLStatementParser {
                 if (variant instanceof SQLBinaryOpExpr) {
                     SQLBinaryOpExpr binaryOpExpr = (SQLBinaryOpExpr) variant;
                     if (binaryOpExpr.getOperator() == SQLBinaryOperator.Assignment) {
-                        SQLSetStatement stmt = new SQLSetStatement(binaryOpExpr.getLeft(), binaryOpExpr.getRight());
+                        SQLSetStatement stmt = new SQLSetStatement(binaryOpExpr.getLeft(), binaryOpExpr.getRight(), getDbType());
                         statementList.add(stmt);
                         continue;
                     }
@@ -246,7 +248,7 @@ public class OracleStatementParser extends SQLStatementParser {
                 accept(Token.COLONEQ);
                 SQLExpr value = this.exprParser.expr();
 
-                SQLSetStatement stmt = new SQLSetStatement(variant, value);
+                SQLSetStatement stmt = new SQLSetStatement(variant, value, getDbType());
                 statementList.add(stmt);
                 continue;
             }

src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleSchemaStatVisitor.java

@@ -265,20 +265,7 @@ public class OracleSchemaStatVisitor extends SchemaStatVisitor implements Oracle
     }
 
     public boolean visit(OracleSelect x) {
-        setCurrentTable(x);
-
-        if (x.getOrderBy() != null) {
-            x.getOrderBy().setParent(x);
-        }
-
-        accept(x.getWithSubQuery());
-        accept(x.getQuery());
-
-        setCurrentTable(x, (String) x.getQuery().getAttribute("table"));
-
-        accept(x.getOrderBy());
-
-        return false;
+        return visit((SQLSelect) x);
     }
 
     public void endVisit(SQLSelect x) {

src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGDeleteStatement.java

@@ -23,6 +23,7 @@ import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement;
 import com.alibaba.druid.sql.dialect.postgresql.ast.PGWithClause;
 import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class PGDeleteStatement extends SQLDeleteStatement implements PGSQLStatement {
 
@@ -31,6 +32,10 @@ public class PGDeleteStatement extends SQLDeleteStatement implements PGSQLStatem
     private List<SQLName> using = new ArrayList<SQLName>(2);
     private boolean       returning;
     private String        alias;
+    
+    public PGDeleteStatement() {
+        super (JdbcConstants.POSTGRESQL);
+    }
 
     public boolean isReturning() {
         return returning;

src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGSelectQueryBlock.java

@@ -19,11 +19,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLObjectImpl;
 import com.alibaba.druid.sql.ast.SQLOrderBy;
 import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.postgresql.ast.PGSQLObjectImpl;
 import com.alibaba.druid.sql.dialect.postgresql.ast.PGWithClause;
 import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor;
+import com.alibaba.druid.sql.dialect.postgresql.visitor.PGOutputVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
 public class PGSelectQueryBlock extends SQLSelectQueryBlock {
@@ -247,5 +249,63 @@ public class PGSelectQueryBlock extends SQLSelectQueryBlock {
             visitor.endVisit(this);
         }
     }
+    public static class PGLimit extends SQLObjectImpl implements SQLExpr {
+
+        public PGLimit(){
+
+        }
+
+        private SQLExpr rowCount;
+        private SQLExpr offset;
+
+        public SQLExpr getRowCount() {
+            return rowCount;
+        }
+
+        public void setRowCount(SQLExpr rowCount) {
+            if (rowCount != null) {
+                rowCount.setParent(this);
+            }
+            this.rowCount = rowCount;
+        }
+
+        public SQLExpr getOffset() {
+            return offset;
+        }
+
+        public void setOffset(SQLExpr offset) {
+            if (offset != null) {
+                offset.setParent(this);
+            }
+            this.offset = offset;
+        }
+
+        @Override
+        protected void accept0(SQLASTVisitor visitor) {
+            if (visitor instanceof PGASTVisitor) {
+            	PGASTVisitor pgVisitor = (PGASTVisitor) visitor;
+
+                if (pgVisitor.visit(this)) {
+                    if (pgVisitor instanceof PGOutputVisitor)
+                    {
+                        PGOutputVisitor pgv = (PGOutputVisitor) pgVisitor;
+                        pgv.print(this.rowCount.toString());
+                        if (this.offset != null)
+                        {
+                            pgv.print(" OFFSET ");
+                            pgv.print(this.offset.toString());
+                        }
+                    }
+                    else
+                    {
+                        acceptChild(visitor, offset);
+                        acceptChild(visitor, rowCount);
+                    }
+                }
+                pgVisitor.endVisit(this);
+            }
+        }
+
+    }
 
 }

src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGSelectStatement.java

@@ -20,16 +20,18 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
 import com.alibaba.druid.sql.dialect.postgresql.ast.PGWithClause;
 import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class PGSelectStatement extends SQLSelectStatement implements PGSQLStatement {
 
     private PGWithClause with;
 
     public PGSelectStatement(){
+        super(JdbcConstants.POSTGRESQL);
     }
 
     public PGSelectStatement(SQLSelect select){
-        super(select);
+        super(select, JdbcConstants.POSTGRESQL);
     }
 
     public PGWithClause getWith() {

src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGUpdateStatement.java

@@ -24,6 +24,7 @@ import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement;
 import com.alibaba.druid.sql.dialect.postgresql.ast.PGWithClause;
 import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class PGUpdateStatement extends SQLUpdateStatement implements PGSQLStatement {
 
@@ -34,6 +35,10 @@ public class PGUpdateStatement extends SQLUpdateStatement implements PGSQLStatem
     private List<SQLExpr>  returning = new ArrayList<SQLExpr>(2);
 
     private SQLTableSource from;
+    
+    public PGUpdateStatement(){
+        super (JdbcConstants.POSTGRESQL);
+    }
 
     public SQLTableSource getFrom() {
         return from;

src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGASTVisitor.java

@@ -27,6 +27,10 @@ import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGUpdateStatement;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
 public interface PGASTVisitor extends SQLASTVisitor {
+	
+	boolean visit(PGSelectQueryBlock.PGLimit x);
+
+	void endVisit(PGSelectQueryBlock.PGLimit x);
 
     void endVisit(PGSelectQueryBlock x);
 

src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGASTVisitorAdapter.java

@@ -24,6 +24,7 @@ import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGInsertStatement;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock.FetchClause;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock.ForClause;
+import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock.PGLimit;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock.WindowClause;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectStatement;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGUpdateStatement;
@@ -156,4 +157,14 @@ public class PGASTVisitorAdapter extends SQLASTVisitorAdapter implements PGASTVi
         return true;
     }
 
+	@Override
+	public boolean visit(PGLimit x) {
+		return true;
+	}
+
+	@Override
+	public void endVisit(PGLimit x) {
+		
+	}
+
 }

src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java

@@ -27,6 +27,7 @@ import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGInsertStatement;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock.FetchClause;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock.ForClause;
+import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock.PGLimit;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock.WindowClause;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectStatement;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGUpdateStatement;
@@ -470,4 +471,14 @@ public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor
 
     }
 
+	@Override
+	public boolean visit(PGLimit x) {
+		return true;
+	}
+
+	@Override
+	public void endVisit(PGLimit x) {
+		
+	}
+
 }

src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGSchemaStatVisitor.java

@@ -30,6 +30,7 @@ import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGInsertStatement;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock.FetchClause;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock.ForClause;
+import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock.PGLimit;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock.WindowClause;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectStatement;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGUpdateStatement;
@@ -264,4 +265,14 @@ public class PGSchemaStatVisitor extends SchemaStatVisitor implements PGASTVisit
     public boolean visit(PGFunctionTableSource x) {
         return true;
     }
+
+    @Override
+    public boolean visit(PGLimit x) {
+        return false;
+    }
+
+    @Override
+    public void endVisit(PGLimit x) {
+        
+    }
 }

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

@@ -22,12 +22,17 @@ import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerStatement;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerTop;
 import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.JdbcConstants;
 
 public class SQLServerUpdateStatement extends SQLUpdateStatement implements SQLServerStatement {
 
     private SQLServerTop    top;
     private SQLTableSource  from;
     private SQLServerOutput output;
+    
+    public SQLServerUpdateStatement(){
+        super (JdbcConstants.SQL_SERVER);
+    }
 
     public SQLServerTop getTop() {
         return top;

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

@@ -374,7 +374,7 @@ public class SQLServerStatementParser extends SQLStatementParser {
         }
 
         if (lexer.token() == Token.VARIANT) {
-            SQLSetStatement stmt = new SQLSetStatement();
+            SQLSetStatement stmt = new SQLSetStatement(getDbType());
             parseAssignItems(stmt.getItems(), stmt);
             return stmt;
         } else {