improved sql parser.

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

@@ -944,6 +944,7 @@ public class MySqlExprParser extends SQLExprParser {
             lexer.nextToken();
 
             SQLExpr seperator = this.primary();
+            seperator.setParent(aggregateExpr);
 
             aggregateExpr.putAttribute("SEPARATOR", seperator);
         }

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

@@ -18,17 +18,22 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt;
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.SQLName;
 import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLPartition;
 import com.alibaba.druid.sql.ast.statement.SQLCreateIndexStatement;
 import com.alibaba.druid.sql.dialect.oracle.ast.OracleSegmentAttributes;
 import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 import com.alibaba.druid.util.JdbcConstants;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class OracleCreateIndexStatement extends SQLCreateIndexStatement implements OracleDDLStatement, OracleSegmentAttributes {
 
     private boolean online            = false;
 
     private boolean indexOnlyTopLevel = false;
+    private boolean cluster           = false;
 
     private boolean noParallel;
 
@@ -47,6 +52,7 @@ public class OracleCreateIndexStatement extends SQLCreateIndexStatement implemen
     private Integer pctthreshold;
 
     private Boolean logging;
+    private Boolean sort;
 
     protected SQLName tablespace;
     protected SQLObject storage;
@@ -83,6 +89,17 @@ public class OracleCreateIndexStatement extends SQLCreateIndexStatement implemen
         this.indexOnlyTopLevel = indexOnlyTopLevel;
     }
 
+    public Boolean getSort() {
+        return sort;
+    }
+
+    public void setSort(Boolean sort) {
+        this.sort = sort;
+    }
+
+    private List<SQLPartition> localPartitions = new ArrayList<SQLPartition>();
+    private List<SQLPartition> globalPartitions = new ArrayList<SQLPartition>();
+
     protected void accept0(SQLASTVisitor visitor) {
         accept0((OracleASTVisitor) visitor);
     }
@@ -124,6 +141,14 @@ public class OracleCreateIndexStatement extends SQLCreateIndexStatement implemen
         this.online = online;
     }
 
+    public boolean isCluster() {
+        return cluster;
+    }
+
+    public void setCluster(boolean cluster) {
+        this.cluster = cluster;
+    }
+
     //////////////
 
     public SQLName getTablespace() {
@@ -233,4 +258,11 @@ public class OracleCreateIndexStatement extends SQLCreateIndexStatement implemen
         this.compressForOltp = compressForOltp;
     }
 
+    public List<SQLPartition> getLocalPartitions() {
+        return localPartitions;
+    }
+
+    public List<SQLPartition> getGlobalPartitions() {
+        return globalPartitions;
+    }
 }

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

@@ -1471,6 +1471,11 @@ public class OracleExprParser extends SQLExprParser {
             subPartition.setValues(values);
         }
 
+        if (lexer.token() == Token.TABLESPACE) {
+            lexer.nextToken();
+            subPartition.setTableSpace(this.name());
+        }
+
         return subPartition;
     }
 

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

@@ -1956,20 +1956,33 @@ public class OracleStatementParser extends SQLStatementParser {
 
         accept(Token.ON);
 
+        if (identifierEquals("CLUSTER")) {
+            lexer.nextToken();
+            stmt.setCluster(true);
+        }
+
         stmt.setTable(this.exprParser.name());
 
-        accept(Token.LPAREN);
+        if (lexer.token() == Token.IDENTIFIER) {
+            String alias = lexer.stringVal();
+            stmt.getTable().setAlias(alias);
+            lexer.nextToken();
+        }
 
-        for (;;) {
-            SQLSelectOrderByItem item = this.exprParser.parseSelectOrderByItem();
-            stmt.addItem(item);
-            if (lexer.token() == Token.COMMA) {
-                lexer.nextToken();
-                continue;
+        if (lexer.token() == Token.LPAREN) {
+            lexer.nextToken();
+
+            for (; ; ) {
+                SQLSelectOrderByItem item = this.exprParser.parseSelectOrderByItem();
+                stmt.addItem(item);
+                if (lexer.token() == Token.COMMA) {
+                    lexer.nextToken();
+                    continue;
+                }
+                break;
             }
-            break;
+            accept(Token.RPAREN);
         }
-        accept(Token.RPAREN);
 
         for (;;) {
             this.getExprParser().parseSegmentAttributes(stmt);
@@ -2005,6 +2018,32 @@ public class OracleStatementParser extends SQLStatementParser {
                 acceptIdentifier("TOPLEVEL");
                 stmt.setIndexOnlyTopLevel(true);
                 continue;
+            } else if (identifierEquals("SORT")) {
+                lexer.nextToken();
+                stmt.setSort(Boolean.TRUE);
+                continue;
+            } else if (identifierEquals("NOSORT")) {
+                lexer.nextToken();
+                stmt.setSort(Boolean.FALSE);
+                continue;
+            } else if (identifierEquals("LOCAL")) {
+                lexer.nextToken();
+                accept(Token.LPAREN);
+                for (;;) {
+                    SQLPartition partition = this.getExprParser().parsePartition();
+                    partition.setParent(stmt);
+                    stmt.getLocalPartitions().add(partition);
+                    if (lexer.token() == Token.COMMA) {
+                        lexer.nextToken();
+                        continue;
+                    } else if (lexer.token() == Token.RPAREN) {
+                        lexer.nextToken();
+                        break;
+                    }
+                    throw new ParserException("TODO : " + lexer.token() + " " + lexer.stringVal());
+                }
+
+                break;
             } else {
                 break;
             }

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

@@ -1748,10 +1748,19 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
 
         x.getName().accept(this);
         print0(ucase ? " ON " : " on ");
+
+        if (x.isCluster()) {
+            print0(ucase ? "CLUSTER " : "cluster ");
+        }
+
         x.getTable().accept(this);
-        print('(');
-        printAndAccept(x.getItems(), ", ");
-        print(')');
+
+        List<SQLSelectOrderByItem> items = x.getItems();
+        if (items.size() > 0) {
+            print('(');
+            printAndAccept(items, ", ");
+            print(')');
+        }
 
         if (x.isIndexOnlyTopLevel()) {
             println();
@@ -1780,8 +1789,28 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS
             x.getParallel().accept(this);
         }
 
+        Boolean sort = x.getSort();
+        if (sort != null) {
+            if (sort.booleanValue()) {
+                print0(ucase ? " SORT" : " sort");
+            } else {
+                print0(ucase ? " NOSORT" : " nosort");
+            }
+        }
+
         this.printOracleSegmentAttributes(x);
 
+        if (x.getLocalPartitions().size() > 0) {
+            println();
+            print0(ucase ? "LOCAL (" : "local (");
+            incrementIndent();
+            println();
+            printlnAndAccept(x.getLocalPartitions(), ",");
+            decrementIndent();
+            println();
+            print(')');
+        }
+
         return false;
     }