Merge origin/master into fix/mysql-column-type-modifiers

Author: minleejae

src/main/java/net/sf/jsqlparser/parser/CCJSqlParserUtil.java

@@ -30,6 +30,7 @@
 import net.sf.jsqlparser.parser.feature.Feature;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.Statements;
+import net.sf.jsqlparser.statement.create.table.ColDataType;
 
 /**
  * Toolfunctions to start and use JSqlParser.
@@ -199,6 +200,61 @@ public static Expression parseExpression(String expression, boolean allowPartial
         });
     }
 
+    /**
+     * Parses a column data type fragment. The complete input must represent the data type; trailing
+     * tokens are rejected.
+     *
+     * @param columnDataType the column data type fragment to parse
+     * @return the parsed column data type, or {@code null} for a null or empty input
+     * @throws JSQLParserException when the input cannot be parsed completely
+     * @see #parseColDataType(String, Consumer)
+     */
+    public static ColDataType parseColDataType(String columnDataType) throws JSQLParserException {
+        return parseColDataType(columnDataType, null);
+    }
+
+    /**
+     * Parses a column data type fragment while allowing the parser to be configured. The complete
+     * input must represent the data type; trailing tokens are rejected.
+     *
+     * @param columnDataType the column data type fragment to parse
+     * @param consumer parser configuration callback, or {@code null}
+     * @return the parsed column data type, or {@code null} for a null or empty input
+     * @throws JSQLParserException when the input cannot be parsed completely
+     */
+    public static ColDataType parseColDataType(String columnDataType,
+            Consumer<CCJSqlParser> consumer) throws JSQLParserException {
+        if (columnDataType == null || columnDataType.isEmpty()) {
+            return null;
+        }
+
+        try {
+            return parseColDataType(columnDataType, false, consumer);
+        } catch (JSQLParserException ex) {
+            return parseColDataType(columnDataType, true, consumer);
+        }
+    }
+
+    private static ColDataType parseColDataType(String columnDataType, boolean allowComplexParsing,
+            Consumer<CCJSqlParser> consumer) throws JSQLParserException {
+        CCJSqlParser parser = newParser(columnDataType)
+                .withAllowComplexParsing(allowComplexParsing);
+        if (consumer != null) {
+            consumer.accept(parser);
+        }
+
+        try {
+            ColDataType result = parser.ColDataType();
+            if (parser.getNextToken().kind != CCJSqlParserTokenManager.EOF) {
+                throw new JSQLParserException(
+                        "could only parse partial column data type " + result);
+            }
+            return result;
+        } catch (ParseException ex) {
+            throw new JSQLParserException(columnDataType, ex);
+        }
+    }
+
     @SuppressWarnings("PMD.CyclomaticComplexity")
     public static Expression parseExpression(String expressionStr, boolean allowPartialParse,
             Consumer<CCJSqlParser> consumer) throws JSQLParserException {

src/main/java/net/sf/jsqlparser/statement/alter/AlterExpression.java

@@ -830,6 +830,8 @@ protected boolean isPartitionOperation() {
         switch (operation) {
             case DISCARD_PARTITION:
             case IMPORT_PARTITION:
+            case ATTACH_PARTITION:
+            case DETACH_PARTITION:
             case TRUNCATE_PARTITION:
             case COALESCE_PARTITION:
             case REORGANIZE_PARTITION:

src/main/java/net/sf/jsqlparser/statement/alter/AlterExpressionPartition.java

@@ -9,15 +9,75 @@
  */
 package net.sf.jsqlparser.statement.alter;
 
+import net.sf.jsqlparser.schema.Table;
+import net.sf.jsqlparser.statement.create.table.PartitionBound;
+
 /**
  * Internal subclass for partition maintenance operations within ALTER TABLE. Handles TRUNCATE,
  * COALESCE, REORGANIZE, EXCHANGE, ANALYZE, CHECK, OPTIMIZE, REBUILD, REPAIR PARTITION, PARTITION
  * BY, and REMOVE PARTITIONING.
  */
 public class AlterExpressionPartition extends AlterExpression {
 
+    public enum DetachMode {
+        CONCURRENTLY, FINALIZE
+    }
+
+    private Table partitionTable;
+    private PartitionBound partitionBound;
+    private DetachMode detachMode;
+
+    public Table getPartitionTable() {
+        return partitionTable;
+    }
+
+    public void setPartitionTable(Table partitionTable) {
+        this.partitionTable = partitionTable;
+    }
+
+    public PartitionBound getPartitionBound() {
+        return partitionBound;
+    }
+
+    public void setPartitionBound(PartitionBound partitionBound) {
+        this.partitionBound = partitionBound;
+    }
+
+    public DetachMode getDetachMode() {
+        return detachMode;
+    }
+
+    public void setDetachMode(DetachMode detachMode) {
+        this.detachMode = detachMode;
+    }
+
+    public AlterExpressionPartition withPartitionTable(Table partitionTable) {
+        setPartitionTable(partitionTable);
+        return this;
+    }
+
+    public AlterExpressionPartition withPartitionBound(PartitionBound partitionBound) {
+        setPartitionBound(partitionBound);
+        return this;
+    }
+
+    public AlterExpressionPartition withDetachMode(DetachMode detachMode) {
+        setDetachMode(detachMode);
+        return this;
+    }
+
     @Override
     protected void appendBody(StringBuilder b) {
-        toStringPartition(b);
+        if (getOperation() == AlterOperation.ATTACH_PARTITION) {
+            b.append("ATTACH PARTITION ").append(partitionTable).append(" ")
+                    .append(partitionBound);
+        } else if (getOperation() == AlterOperation.DETACH_PARTITION) {
+            b.append("DETACH PARTITION ").append(partitionTable);
+            if (detachMode != null) {
+                b.append(" ").append(detachMode);
+            }
+        } else {
+            toStringPartition(b);
+        }
     }
 }

src/main/java/net/sf/jsqlparser/statement/alter/AlterOperation.java

@@ -12,7 +12,7 @@
 import java.util.Locale;
 
 public enum AlterOperation {
-    ADD, ALTER, DROP, DROP_PRIMARY_KEY, DROP_UNIQUE, DROP_FOREIGN_KEY, MODIFY, CHANGE, CONVERT, COLLATE, ALGORITHM, RENAME, RENAME_TABLE, RENAME_INDEX, RENAME_KEY, RENAME_CONSTRAINT, COMMENT, COMMENT_WITH_EQUAL_SIGN, UNSPECIFIC, ADD_PARTITION, DROP_PARTITION, DISCARD_PARTITION, IMPORT_PARTITION, TRUNCATE_PARTITION, COALESCE_PARTITION, REORGANIZE_PARTITION, EXCHANGE_PARTITION, ANALYZE_PARTITION, CHECK_PARTITION, OPTIMIZE_PARTITION, REBUILD_PARTITION, REPAIR_PARTITION, REMOVE_PARTITIONING, PARTITION_BY, SET_TABLE_OPTION, ENGINE, FORCE, KEY_BLOCK_SIZE, LOCK, DISCARD_TABLESPACE, IMPORT_TABLESPACE, DISABLE_KEYS, ENABLE_KEYS, ENABLE_ROW_LEVEL_SECURITY, DISABLE_ROW_LEVEL_SECURITY, FORCE_ROW_LEVEL_SECURITY, NO_FORCE_ROW_LEVEL_SECURITY;
+    ADD, ALTER, DROP, DROP_PRIMARY_KEY, DROP_UNIQUE, DROP_FOREIGN_KEY, MODIFY, CHANGE, CONVERT, COLLATE, ALGORITHM, RENAME, RENAME_TABLE, RENAME_INDEX, RENAME_KEY, RENAME_CONSTRAINT, COMMENT, COMMENT_WITH_EQUAL_SIGN, UNSPECIFIC, ADD_PARTITION, DROP_PARTITION, ATTACH_PARTITION, DETACH_PARTITION, DISCARD_PARTITION, IMPORT_PARTITION, TRUNCATE_PARTITION, COALESCE_PARTITION, REORGANIZE_PARTITION, EXCHANGE_PARTITION, ANALYZE_PARTITION, CHECK_PARTITION, OPTIMIZE_PARTITION, REBUILD_PARTITION, REPAIR_PARTITION, REMOVE_PARTITIONING, PARTITION_BY, SET_TABLE_OPTION, ENGINE, FORCE, KEY_BLOCK_SIZE, LOCK, DISCARD_TABLESPACE, IMPORT_TABLESPACE, DISABLE_KEYS, ENABLE_KEYS, ENABLE_ROW_LEVEL_SECURITY, DISABLE_ROW_LEVEL_SECURITY, FORCE_ROW_LEVEL_SECURITY, NO_FORCE_ROW_LEVEL_SECURITY;
 
     public static AlterOperation from(String operation) {
         return Enum.valueOf(AlterOperation.class, operation.toUpperCase(Locale.ROOT));

src/main/java/net/sf/jsqlparser/statement/create/index/CreateIndex.java

@@ -12,9 +12,11 @@
 import static java.util.stream.Collectors.joining;
 
 import java.util.*;
+import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.schema.*;
 import net.sf.jsqlparser.statement.*;
 import net.sf.jsqlparser.statement.create.table.*;
+import net.sf.jsqlparser.statement.select.PlainSelect;
 
 public class CreateIndex implements Statement {
 
@@ -25,6 +27,11 @@ public class CreateIndex implements Statement {
     private boolean usingIfNotExists = false;
     private boolean concurrently;
     private boolean only;
+    private List<String> includeColumns;
+    private Boolean nullsDistinct;
+    private List<Index.Option> storageParameters;
+    private String tableSpace;
+    private Expression where;
 
     public boolean isIndexTypeBeforeOn() {
         return indexTypeBeforeOn;
@@ -59,6 +66,46 @@ public void setOnly(boolean only) {
         this.only = only;
     }
 
+    public List<String> getIncludeColumns() {
+        return includeColumns;
+    }
+
+    public void setIncludeColumns(List<String> includeColumns) {
+        this.includeColumns = includeColumns;
+    }
+
+    public Boolean getNullsDistinct() {
+        return nullsDistinct;
+    }
+
+    public void setNullsDistinct(Boolean nullsDistinct) {
+        this.nullsDistinct = nullsDistinct;
+    }
+
+    public List<Index.Option> getStorageParameters() {
+        return storageParameters;
+    }
+
+    public void setStorageParameters(List<Index.Option> storageParameters) {
+        this.storageParameters = storageParameters;
+    }
+
+    public String getTableSpace() {
+        return tableSpace;
+    }
+
+    public void setTableSpace(String tableSpace) {
+        this.tableSpace = tableSpace;
+    }
+
+    public Expression getWhere() {
+        return where;
+    }
+
+    public void setWhere(Expression where) {
+        this.where = where;
+    }
+
     @Override
     public <T, S> T accept(StatementVisitor<T> statementVisitor, S context) {
         return statementVisitor.visit(this, context);
@@ -135,6 +182,8 @@ public String toString() {
 
             buffer.append(")");
 
+            appendPostgreSqlTail(buffer);
+
             if (tailParameters != null) {
                 for (String param : tailParameters) {
                     buffer.append(" ").append(param);
@@ -145,6 +194,25 @@ public String toString() {
         return buffer.toString();
     }
 
+    private void appendPostgreSqlTail(StringBuilder buffer) {
+        if (includeColumns != null) {
+            buffer.append(" INCLUDE (").append(String.join(", ", includeColumns)).append(")");
+        }
+        if (nullsDistinct != null) {
+            buffer.append(" NULLS ").append(nullsDistinct ? "DISTINCT" : "NOT DISTINCT");
+        }
+        if (storageParameters != null) {
+            buffer.append(" WITH ")
+                    .append(PlainSelect.getStringList(storageParameters, true, true));
+        }
+        if (tableSpace != null) {
+            buffer.append(" TABLESPACE ").append(tableSpace);
+        }
+        if (where != null) {
+            buffer.append(" WHERE ").append(where);
+        }
+    }
+
     public CreateIndex withTable(Table table) {
         this.setTable(table);
         return this;
@@ -169,4 +237,29 @@ public CreateIndex withOnly(boolean only) {
         setOnly(only);
         return this;
     }
+
+    public CreateIndex withIncludeColumns(List<String> includeColumns) {
+        setIncludeColumns(includeColumns);
+        return this;
+    }
+
+    public CreateIndex withNullsDistinct(Boolean nullsDistinct) {
+        setNullsDistinct(nullsDistinct);
+        return this;
+    }
+
+    public CreateIndex withStorageParameters(List<Index.Option> storageParameters) {
+        setStorageParameters(storageParameters);
+        return this;
+    }
+
+    public CreateIndex withTableSpace(String tableSpace) {
+        setTableSpace(tableSpace);
+        return this;
+    }
+
+    public CreateIndex withWhere(Expression where) {
+        setWhere(where);
+        return this;
+    }
 }

src/main/java/net/sf/jsqlparser/statement/create/table/ColDataType.java

@@ -35,6 +35,8 @@ public enum Signedness {
     private List<Integer> arrayData = new ArrayList<Integer>();
     private Signedness signedness;
     private boolean zerofill;
+    private Integer precision;
+    private Integer scale;
 
     public ColDataType() {
         // empty constructor
@@ -44,8 +46,10 @@ public ColDataType(String dataType, int precision, int scale) {
         this.dataType = dataType;
 
         if (precision >= 0) {
+            this.precision = precision;
             this.dataType += " (" + (precision == Integer.MAX_VALUE ? "MAX" : precision);
             if (scale >= 0) {
+                this.scale = scale;
                 this.dataType += ", " + scale;
             }
             this.dataType += ")";
@@ -116,6 +120,32 @@ public void setZerofill(boolean zerofill) {
         this.zerofill = zerofill;
     }
 
+    /**
+     * The first numeric type parameter, e.g. {@code 255} for {@code VARCHAR(255)} or {@code 10} for
+     * {@code DECIMAL(10, 2)}. {@code MAX} is reported as {@link Integer#MAX_VALUE}. Returns
+     * {@code null} when the type carries no numeric parameters, e.g. {@code INT} or
+     * {@code ENUM('a', 'b')}.
+     */
+    public Integer getPrecision() {
+        return precision;
+    }
+
+    public void setPrecision(Integer precision) {
+        this.precision = precision;
+    }
+
+    /**
+     * The second numeric type parameter, e.g. {@code 2} for {@code DECIMAL(10, 2)}. Returns
+     * {@code null} when absent.
+     */
+    public Integer getScale() {
+        return scale;
+    }
+
+    public void setScale(Integer scale) {
+        this.scale = scale;
+    }
+
     @Override
     public String toString() {
         StringBuilder arraySpec = new StringBuilder();
@@ -172,6 +202,16 @@ public ColDataType withZerofill(boolean zerofill) {
         return this;
     }
 
+    public ColDataType withPrecision(Integer precision) {
+        this.setPrecision(precision);
+        return this;
+    }
+
+    public ColDataType withScale(Integer scale) {
+        this.setScale(scale);
+        return this;
+    }
+
     public ColDataType addArgumentsStringList(String... argumentsStringList) {
         List<String> collection =
                 Optional.ofNullable(getArgumentsStringList()).orElseGet(ArrayList::new);