improve mysql ddl parser

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

@@ -15,15 +15,10 @@
  */
 package com.alibaba.druid.sql.dialect.mysql.ast.statement;
 
-import java.util.List;
-
 import com.alibaba.druid.sql.ast.SQLExpr;
-import com.alibaba.druid.sql.ast.SQLName;
-import com.alibaba.druid.sql.ast.SQLPartitioningClause;
-import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl;
 import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
 
-public class MySqlPartitionByHash extends MySqlObjectImpl implements SQLPartitioningClause {
+public class MySqlPartitionByHash extends MySqlPartitioningClause {
 
     private static final long serialVersionUID = 1L;
 
@@ -38,6 +33,7 @@ public class MySqlPartitionByHash extends MySqlObjectImpl implements SQLPartitio
         if (visitor.visit(this)) {
             acceptChild(visitor, expr);
             acceptChild(visitor, partitionCount);
+            acceptChild(visitor, getPartitions());
         }
         visitor.endVisit(this);
     }

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

@@ -20,11 +20,9 @@ import java.util.List;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.SQLName;
-import com.alibaba.druid.sql.ast.SQLPartitioningClause;
-import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl;
 import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
 
-public class MySqlPartitionByKey extends MySqlObjectImpl implements SQLPartitioningClause {
+public class MySqlPartitionByKey extends MySqlPartitioningClause {
 
     private static final long serialVersionUID = 1L;
 
@@ -39,6 +37,7 @@ public class MySqlPartitionByKey extends MySqlObjectImpl implements SQLPartition
         if (visitor.visit(this)) {
             acceptChild(visitor, columns);
             acceptChild(visitor, partitionCount);
+            acceptChild(visitor, getPartitions());
         }
         visitor.endVisit(this);
     }

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

@@ -0,0 +1,73 @@
+/*
+ * 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.dialect.mysql.ast.statement;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
+
+public class MySqlPartitionByRange extends MySqlPartitioningClause {
+
+    private static final long serialVersionUID = 1L;
+
+    private SQLExpr           expr;
+
+    private List<SQLName>     columns          = new ArrayList<SQLName>();
+
+    private SQLExpr           partitionCount;
+
+    @Override
+    public void accept0(MySqlASTVisitor visitor) {
+        if (visitor.visit(this)) {
+            acceptChild(visitor, expr);
+            acceptChild(visitor, columns);
+            acceptChild(visitor, partitionCount);
+            acceptChild(visitor, getPartitions());
+        }
+        visitor.endVisit(this);
+    }
+
+    public SQLExpr getExpr() {
+        return expr;
+    }
+
+    public void setExpr(SQLExpr expr) {
+        if (expr != null) {
+            expr.setParent(this);
+        }
+        this.expr = expr;
+    }
+
+    public SQLExpr getPartitionCount() {
+        return partitionCount;
+    }
+
+    public void setPartitionCount(SQLExpr partitionCount) {
+        this.partitionCount = partitionCount;
+    }
+
+    public List<SQLName> getColumns() {
+        return columns;
+    }
+
+    public void setColumns(List<SQLName> columns) {
+        this.columns = columns;
+    }
+
+}

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

@@ -0,0 +1,22 @@
+package com.alibaba.druid.sql.dialect.mysql.ast.statement;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.druid.sql.ast.SQLPartitioningClause;
+import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl;
+
+@SuppressWarnings("serial")
+public abstract class MySqlPartitioningClause extends MySqlObjectImpl implements SQLPartitioningClause {
+
+    private List<MySqlPartitioningDef> partitions = new ArrayList<MySqlPartitioningDef>();
+
+    public List<MySqlPartitioningDef> getPartitions() {
+        return partitions;
+    }
+
+    public void setPartitions(List<MySqlPartitioningDef> partitions) {
+        this.partitions = partitions;
+    }
+
+}

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

@@ -0,0 +1,75 @@
+package com.alibaba.druid.sql.dialect.mysql.ast.statement;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl;
+import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
+
+@SuppressWarnings("serial")
+public class MySqlPartitioningDef extends MySqlObjectImpl {
+
+    private SQLName name;
+
+    private Values  values;
+
+    @Override
+    public void accept0(MySqlASTVisitor visitor) {
+        if (visitor.visit(this)) {
+            acceptChild(visitor, name);
+            acceptChild(visitor, values);
+        }
+        visitor.endVisit(this);
+    }
+
+    public Values getValues() {
+        return values;
+    }
+
+    public void setValues(Values values) {
+        this.values = values;
+    }
+
+    public SQLName getName() {
+        return name;
+    }
+
+    public void setName(SQLName name) {
+        this.name = name;
+    }
+
+    public static abstract class Values extends MySqlObjectImpl {
+
+        private final List<SQLExpr> items = new ArrayList<SQLExpr>();
+
+        public List<SQLExpr> getItems() {
+            return items;
+        }
+    }
+
+    public static class LessThanValues extends Values {
+
+        @Override
+        public void accept0(MySqlASTVisitor visitor) {
+            if (visitor.visit(this)) {
+                acceptChild(visitor, getItems());
+            }
+            visitor.endVisit(this);
+        }
+
+    }
+
+    public static class InValues extends Values {
+
+        @Override
+        public void accept0(MySqlASTVisitor visitor) {
+            if (visitor.visit(this)) {
+                acceptChild(visitor, getItems());
+            }
+            visitor.endVisit(this);
+        }
+
+    }
+}

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

@@ -27,6 +27,9 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStateme
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement.TableSpaceOption;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitionByHash;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitionByKey;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitionByRange;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitioningClause;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitioningDef;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlTableIndex;
 import com.alibaba.druid.sql.parser.ParserException;
 import com.alibaba.druid.sql.parser.SQLCreateTableParser;
@@ -314,17 +317,17 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
                 if (lexer.token() == Token.EQ) {
                     lexer.nextToken();
                 }
-                
+
                 stmt.getTableOptions().put("STATS_AUTO_RECALC", this.exprParser.expr());
                 continue;
             }
-            
+
             if (identifierEquals("STATS_PERSISTENT")) {
                 lexer.nextToken();
                 if (lexer.token() == Token.EQ) {
                     lexer.nextToken();
                 }
-                
+
                 stmt.getTableOptions().put("STATS_PERSISTENT", this.exprParser.expr());
                 continue;
             }
@@ -356,6 +359,8 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
                 lexer.nextToken();
                 accept(Token.BY);
                 
+                MySqlPartitioningClause partitionClause;
+
                 boolean linera = false;
                 if (identifierEquals("LINEAR")) {
                     lexer.nextToken();
@@ -365,11 +370,11 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
                 if (lexer.token() == Token.KEY) {
                     MySqlPartitionByKey clause = new MySqlPartitionByKey();
                     lexer.nextToken();
-                    
+
                     if (linera) {
                         clause.setLinear(true);
                     }
-                    
+
                     accept(Token.LPAREN);
                     for (;;) {
                         clause.getColumns().add(this.exprParser.name());
@@ -380,7 +385,8 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
                         break;
                     }
                     accept(Token.RPAREN);
-                    stmt.setPartitioning(clause);
+                    
+                    partitionClause = clause;
 
                     if (identifierEquals("PARTITIONS")) {
                         lexer.nextToken();
@@ -389,23 +395,92 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
                 } else if (identifierEquals("HASH")) {
                     lexer.nextToken();
                     MySqlPartitionByHash clause = new MySqlPartitionByHash();
-                    
+
                     if (linera) {
                         clause.setLinear(true);
                     }
-                    
+
                     accept(Token.LPAREN);
                     clause.setExpr(this.exprParser.expr());
                     accept(Token.RPAREN);
-                    stmt.setPartitioning(clause);
+                    partitionClause = clause;
 
                     if (identifierEquals("PARTITIONS")) {
                         lexer.nextToken();
                         clause.setPartitionCount(this.exprParser.expr());
                     }
+
+                } else if (identifierEquals("RANGE")) {
+                    lexer.nextToken();
+                    MySqlPartitionByRange clause = new MySqlPartitionByRange();
+
+                    if (lexer.token() == Token.LPAREN) {
+                        lexer.nextToken();
+                        clause.setExpr(this.exprParser.expr());
+                        accept(Token.RPAREN);
+                    } else {
+                        acceptIdentifier("COLUMNS");
+                        accept(Token.LPAREN);
+                        for (;;) {
+                            clause.getColumns().add(this.exprParser.name());
+                            if (lexer.token() == Token.COMMA) {
+                                lexer.nextToken();
+                                continue;
+                            }
+                            break;
+                        }
+                        accept(Token.RPAREN);
+                    }
+                    partitionClause = clause;
+
+                    if (identifierEquals("PARTITIONS")) {
+                        lexer.nextToken();
+                        clause.setPartitionCount(this.exprParser.expr());
+                    }
+                    //
                 } else {
                     throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
                 }
+                
+                if (lexer.token() == Token.LPAREN) {
+                    lexer.nextToken();
+                    for (;;) {
+                        acceptIdentifier("PARTITION");
+                        
+                        MySqlPartitioningDef partitionDef = new MySqlPartitioningDef();
+                        
+                        partitionDef.setName(this.exprParser.name());
+                        
+                        if (lexer.token() == Token.VALUES) {
+                            lexer.nextToken();
+                            if (lexer.token() == Token.IN) {
+                                throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
+                            } else {
+                                acceptIdentifier("LESS");
+                                acceptIdentifier("THAN");
+                                
+                                MySqlPartitioningDef.LessThanValues values = new MySqlPartitioningDef.LessThanValues();
+                                
+                                accept(Token.LPAREN);
+                                this.exprParser.exprList(values.getItems());
+                                accept(Token.RPAREN);
+                                partitionDef.setValues(values);
+                            }
+                        }
+                        
+                        partitionClause.getPartitions().add(partitionDef);
+                        
+                        if (lexer.token() == Token.COMMA) {
+                            lexer.nextToken();
+                            continue;
+                        } else {
+                            break;
+                        }
+                    }
+                    accept(Token.RPAREN);
+                }
+                
+                stmt.setPartitioning(partitionClause);
             }
 
             break;

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

@@ -60,6 +60,8 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlLoadXmlStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlLockTableStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitionByHash;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitionByKey;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitionByRange;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitioningDef;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPrepareStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlRenameTableStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlReplaceStatement;
@@ -549,4 +551,20 @@ public interface MySqlASTVisitor extends SQLASTVisitor {
     boolean visit(MySqlPartitionByHash x);
 
     void endVisit(MySqlPartitionByHash x);
-} // 
+    
+    boolean visit(MySqlPartitionByRange x);
+
+    void endVisit(MySqlPartitionByRange x);
+    
+    boolean visit(MySqlPartitioningDef x);
+
+    void endVisit(MySqlPartitioningDef x);
+    
+    boolean visit(MySqlPartitioningDef.LessThanValues x);
+
+    void endVisit(MySqlPartitioningDef.LessThanValues x);
+    
+    boolean visit(MySqlPartitioningDef.InValues x);
+
+    void endVisit(MySqlPartitioningDef.InValues x);
+} //  

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

@@ -62,6 +62,10 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlLoadXmlStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlLockTableStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitionByHash;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitionByKey;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitionByRange;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitioningDef;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitioningDef.InValues;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitioningDef.LessThanValues;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPrepareStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlRenameTableStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlReplaceStatement;
@@ -1215,4 +1219,44 @@ public class MySqlASTVisitorAdapter extends SQLASTVisitorAdapter implements
     public void endVisit(MySqlPartitionByHash x) {
         
     }
+    
+    @Override
+    public boolean visit(MySqlPartitionByRange x) {
+        return true;
+    }
+
+    @Override
+    public void endVisit(MySqlPartitionByRange x) {
+        
+    }
+
+    @Override
+    public boolean visit(MySqlPartitioningDef x) {
+        return true;
+    }
+
+    @Override
+    public void endVisit(MySqlPartitioningDef x) {
+        
+    }
+
+    @Override
+    public boolean visit(LessThanValues x) {
+        return true;
+    }
+
+    @Override
+    public void endVisit(LessThanValues x) {
+        
+    }
+
+    @Override
+    public boolean visit(InValues x) {
+        return true;
+    }
+
+    @Override
+    public void endVisit(InValues x) {
+        
+    }
 } //

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

@@ -82,6 +82,9 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlLoadXmlStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlLockTableStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitionByHash;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitionByKey;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitionByRange;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitioningDef.InValues;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitioningDef.LessThanValues;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPrepareStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlRenameTableStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlReplaceStatement;
@@ -91,6 +94,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSQLColumnDefinitio
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectGroupBy;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock.Limit;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitioningDef;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetCharSetStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetNamesStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetTransactionIsolationLevelStatement;
@@ -1510,6 +1514,43 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
         }
         return false;
     }
+    
+    @Override
+    public void endVisit(MySqlPartitionByRange x) {
+
+    }
+
+    @Override
+    public boolean visit(MySqlPartitionByRange x) {
+        print("PARTITION BY RANGE (");
+        printAndAccept(x.getColumns(), ", ");
+        print(")");
+
+        if (x.getPartitionCount() != null) {
+            print(" PARTITIONS ");
+            x.getPartitionCount().accept(this);
+        }
+        
+        List<MySqlPartitioningDef> partitions = x.getPartitions();
+        int partitionsSize = partitions.size();
+        if (partitionsSize > 0) {
+            print("(");
+            incrementIndent();
+            for (int i = 0; i < partitionsSize; ++i) {
+                println();
+                partitions.get(i).accept(this);
+                if (i != partitionsSize - 1) {
+                    print(", ");
+                }
+            }
+            decrementIndent();
+            println();
+            print(")");
+        }
+        return false;
+    }
+    
+    //MySqlPartitionByRange
 
     @Override
     public void endVisit(MySqlPartitionByHash x) {
@@ -1531,6 +1572,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
             print(" PARTITIONS ");
             x.getPartitionCount().accept(this);
         }
+        
         return false;
     }
 
@@ -2905,4 +2947,46 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
     public void endVisit(TableSpaceOption x) {
 
     }
+
+    @Override
+    public boolean visit(MySqlPartitioningDef x) {
+        print("PARTITION ");
+        x.getName().accept(this);
+        if (x.getValues() != null) {
+            print(' ');
+            x.getValues().accept(this);
+        }
+        return false;
+    }
+
+    @Override
+    public void endVisit(MySqlPartitioningDef x) {
+        
+    }
+
+    @Override
+    public boolean visit(LessThanValues x) {
+        print("VALUES LESS THAN (");
+        printAndAccept(x.getItems(), ", ");
+        print(')');
+        return false;
+    }
+
+    @Override
+    public void endVisit(LessThanValues x) {
+        
+    }
+
+    @Override
+    public boolean visit(InValues x) {
+        print("VALUES IN (");
+        printAndAccept(x.getItems(), ", ");
+        print(')');
+        return false;
+    }
+
+    @Override
+    public void endVisit(InValues x) {
+        
+    }
 } //

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

@@ -75,6 +75,10 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlLoadXmlStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlLockTableStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitionByHash;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitionByKey;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitionByRange;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitioningDef;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitioningDef.InValues;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitioningDef.LessThanValues;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPrepareStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlRenameTableStatement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlReplaceStatement;
@@ -1299,4 +1303,44 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS
         
     }
 
+    @Override
+    public boolean visit(MySqlPartitionByRange x) {
+        return false;
+    }
+
+    @Override
+    public void endVisit(MySqlPartitionByRange x) {
+        
+    }
+
+    @Override
+    public boolean visit(MySqlPartitioningDef x) {
+        return false;
+    }
+
+    @Override
+    public void endVisit(MySqlPartitioningDef x) {
+        
+    }
+
+    @Override
+    public boolean visit(LessThanValues x) {
+        return false;
+    }
+
+    @Override
+    public void endVisit(LessThanValues x) {
+        
+    }
+
+    @Override
+    public boolean visit(InValues x) {
+        return false;
+    }
+
+    @Override
+    public void endVisit(InValues x) {
+        
+    }
+
 }