Merge upstream master and preserve temporal foreign key attributes

Signed-off-by: minleejae <mmj9808@gmail.com>

Author: minleejae

src/main/java/net/sf/jsqlparser/schema/Sequence.java

@@ -187,7 +187,7 @@ public Sequence addParameters(Collection<? extends Parameter> parameters) {
      * The available parameters to a sequence
      */
     public enum ParameterType {
-        INCREMENT_BY, INCREMENT, START_WITH, START, RESTART_WITH, MAXVALUE, NOMAXVALUE, MINVALUE, NOMINVALUE, CYCLE, NOCYCLE, CACHE, NOCACHE, ORDER, NOORDER, KEEP, NOKEEP, SESSION, GLOBAL, NO_MINVALUE, NO_MAXVALUE, NO_CYCLE;
+        INCREMENT_BY, INCREMENT, START_WITH, START, RESTART_WITH, MAXVALUE, NOMAXVALUE, MINVALUE, NOMINVALUE, CYCLE, NOCYCLE, CACHE, NOCACHE, ORDER, NOORDER, KEEP, NOKEEP, SESSION, GLOBAL, NO_MINVALUE, NO_MAXVALUE, NO_CYCLE, SEQUENCE_NAME;
 
         public static ParameterType from(String type) {
             return Enum.valueOf(ParameterType.class, type.toUpperCase(Locale.ROOT));
@@ -201,6 +201,7 @@ public static class Parameter implements java.io.Serializable {
 
         private final ParameterType option;
         private Long value;
+        private Sequence sequenceName;
 
         public Parameter(ParameterType option) {
             this.option = option;
@@ -214,6 +215,20 @@ public ParameterType getOption() {
             return option;
         }
 
+        /** The sequence named by an identity declaration's SEQUENCE NAME option. */
+        public Sequence getSequenceName() {
+            return sequenceName;
+        }
+
+        public void setSequenceName(Sequence sequenceName) {
+            this.sequenceName = sequenceName;
+        }
+
+        public Parameter withSequenceName(Sequence sequenceName) {
+            setSequenceName(sequenceName);
+            return this;
+        }
+
         @Override
         public String toString() {
             return formatParameter();
@@ -225,6 +240,8 @@ public void setValue(Long value) {
 
         public String formatParameter() {
             switch (option) {
+                case SEQUENCE_NAME:
+                    return "SEQUENCE NAME " + sequenceName.getFullyQualifiedName();
                 case INCREMENT_BY:
                     return prefix("INCREMENT BY");
                 case INCREMENT:

src/main/java/net/sf/jsqlparser/statement/ReferentialAction.java

@@ -11,11 +11,15 @@
 
 import java.io.Serializable;
 import java.util.Locale;
+import java.util.List;
+import java.util.Objects;
+import net.sf.jsqlparser.statement.select.PlainSelect;
 
 public class ReferentialAction implements Serializable {
 
     private Type type;
     private Action action;
+    private List<String> columnNames;
 
     public ReferentialAction() {
         // default constructor
@@ -52,6 +56,20 @@ public ReferentialAction withAction(Action action) {
         return this;
     }
 
+    /** Columns affected by PostgreSQL ON DELETE SET NULL or SET DEFAULT; null means all columns. */
+    public List<String> getColumnNames() {
+        return columnNames;
+    }
+
+    public void setColumnNames(List<String> columnNames) {
+        this.columnNames = columnNames;
+    }
+
+    public ReferentialAction withColumnNames(List<String> columnNames) {
+        setColumnNames(columnNames);
+        return this;
+    }
+
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -64,7 +82,9 @@ public int hashCode() {
     @Override
     public String toString() {
         return " ON " + getType().name() + " " +
-                getAction().getAction();
+                getAction().getAction()
+                + (columnNames == null ? ""
+                        : " " + PlainSelect.getStringList(columnNames, true, true));
     }
 
     @Override
@@ -79,12 +99,8 @@ public boolean equals(Object obj) {
             return false;
         }
         ReferentialAction other = (ReferentialAction) obj;
-        // if (action != other.action) {
-        // return false;
-        // }
-        // if (type != other.type) {
-        // return false;
-        return action == other.action && type == other.type;
+        return action == other.action && type == other.type
+                && Objects.equals(columnNames, other.columnNames);
     }
 
     public enum Type {

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

@@ -9,16 +9,61 @@
  */
 package net.sf.jsqlparser.statement.alter;
 
+import net.sf.jsqlparser.statement.create.table.TableOption;
+
 /**
  * Internal subclass for table-level option operations within ALTER TABLE. Handles ENGINE,
  * ALGORITHM, LOCK, KEY_BLOCK_SIZE, COMMENT, ENCRYPTION, AUTO_INCREMENT (SET_TABLE_OPTION),
  * DISCARD/IMPORT TABLESPACE, DISABLE/ENABLE KEYS.
  */
 public class AlterExpressionTableOption extends AlterExpression {
 
+    private TableOption structuredTableOption;
+
+    public TableOption getStructuredTableOption() {
+        return structuredTableOption;
+    }
+
+    /** Uses the same option model as CREATE TABLE, with legacy getters as live projections. */
+    public void setStructuredTableOption(TableOption option) {
+        structuredTableOption = option;
+        setOperation(AlterOperation.SET_TABLE_OPTION);
+        super.setTableOption(null);
+        super.setUseEqual(false);
+    }
+
+    @Override
+    public String getTableOption() {
+        return structuredTableOption == null ? super.getTableOption()
+                : structuredTableOption.toString();
+    }
+
+    @Override
+    public void setTableOption(String option) {
+        structuredTableOption = null;
+        super.setTableOption(option);
+    }
+
+    @Override
+    public boolean getUseEqual() {
+        return structuredTableOption == null ? super.getUseEqual()
+                : structuredTableOption.isUseEquals();
+    }
+
+    @Override
+    public void setUseEqual(boolean useEqual) {
+        if (structuredTableOption != null) {
+            structuredTableOption.setUseEquals(useEqual);
+        }
+        super.setUseEqual(useEqual);
+    }
+
     @Override
     protected void appendBody(StringBuilder b) {
         switch (getOperation()) {
+            case SET_TABLE_OPTION:
+                b.append(getTableOption());
+                break;
             case COMMENT:
                 b.append("COMMENT ");
                 b.append(getCommentText());

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

@@ -22,8 +22,6 @@ public class CheckConstraint extends NamedConstraint {
 
     private Expression expression;
 
-    private Boolean enforced;
-
     private boolean noInherit;
 
     public CheckConstraint() {
@@ -61,11 +59,19 @@ public CheckConstraint withNoInherit(boolean noInherit) {
     }
 
     public Boolean getEnforced() {
-        return enforced;
+        return getConstraintAttributes() == null ? null : getConstraintAttributes().getEnforced();
     }
 
     public void setEnforced(Boolean enforced) {
-        this.enforced = enforced;
+        ConstraintAttributes attributes = getConstraintAttributes();
+        if (attributes == null) {
+            if (enforced == null) {
+                return;
+            }
+            attributes = new ConstraintAttributes();
+            setConstraintAttributes(attributes);
+        }
+        attributes.setEnforced(enforced);
     }
 
     @Override
@@ -81,9 +87,6 @@ public void appendTo(StringBuilder b, Consumer<Expression> expressionPrinter) {
         if (noInherit) {
             b.append(" NO INHERIT");
         }
-        if (enforced != null) {
-            b.append(enforced ? " ENFORCED" : " NOT ENFORCED");
-        }
         appendConstraintSuffixTo(b);
         appendConstraintAttributesTo(b);
     }

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

@@ -20,6 +20,7 @@ public enum Initially {
     private Boolean deferrable;
     private Initially initially;
     private boolean notValid;
+    private Boolean enforced;
 
     public Boolean getDeferrable() {
         return deferrable;
@@ -45,13 +46,25 @@ public void setNotValid(boolean notValid) {
         this.notValid = notValid;
     }
 
+    /** Null preserves an omitted ENFORCED clause. */
+    public Boolean getEnforced() {
+        return enforced;
+    }
+
+    public void setEnforced(Boolean enforced) {
+        this.enforced = enforced;
+    }
+
     public void appendTo(StringBuilder sql) {
         if (deferrable != null) {
             sql.append(deferrable ? " DEFERRABLE" : " NOT DEFERRABLE");
         }
         if (initially != null) {
             sql.append(" INITIALLY ").append(initially);
         }
+        if (enforced != null) {
+            sql.append(enforced ? " ENFORCED" : " NOT ENFORCED");
+        }
         if (notValid) {
             sql.append(" NOT VALID");
         }

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

@@ -35,11 +35,13 @@ public class CreateTable implements Statement {
     private List<Index> indexes;
     private List<TableElement> tableElements;
     private Select select;
+    private DuplicateHandling duplicateHandling;
     private Table likeTable;
     private Table cloneTable;
     private ColDataType ofType;
     private boolean selectParenthesis;
     private boolean useAsKeyword = true;
+    private Boolean withData;
     private boolean ifNotExists = false;
     private boolean orReplace = false;
     private TablePartitioning partitioning;
@@ -50,6 +52,19 @@ public class CreateTable implements Statement {
 
     private SpannerInterleaveIn interleaveIn = null;
 
+    public enum DuplicateHandling {
+        IGNORE, REPLACE
+    }
+
+    /** MySQL's duplicate-key handling when creating a table from a query; null if omitted. */
+    public DuplicateHandling getDuplicateHandling() {
+        return duplicateHandling;
+    }
+
+    public void setDuplicateHandling(DuplicateHandling duplicateHandling) {
+        this.duplicateHandling = duplicateHandling;
+    }
+
     @Override
     public <T, S> T accept(StatementVisitor<T> statementVisitor, S context) {
         return statementVisitor.visit(this, context);
@@ -204,9 +219,21 @@ public void setUseAsKeyword(boolean useAsKeyword) {
         this.useAsKeyword = useAsKeyword;
     }
 
+    /** Returns null for omission, true for WITH DATA, and false for WITH NO DATA. */
+    public Boolean getWithData() {
+        return withData;
+    }
+
+    public void setWithData(Boolean withData) {
+        this.withData = withData;
+    }
+
     public StringBuilder appendSelectTo(StringBuilder builder,
             java.util.function.Consumer<Select> selectRenderer) {
         if (select != null) {
+            if (duplicateHandling != null) {
+                builder.append(' ').append(duplicateHandling);
+            }
             builder.append(useAsKeyword ? " AS " : " ");
             if (selectParenthesis) {
                 builder.append("(");
@@ -215,6 +242,9 @@ public StringBuilder appendSelectTo(StringBuilder builder,
             if (selectParenthesis) {
                 builder.append(")");
             }
+            if (withData != null) {
+                builder.append(withData ? " WITH DATA" : " WITH NO DATA");
+            }
         }
         return builder;
     }

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

@@ -33,8 +33,20 @@ public enum MatchType {
     private List<String> referencedColumnNames;
     private MatchType matchType;
     private boolean usingPeriod;
+    private ConstraintAttributes constraintAttributes;
     private final Set<ReferentialAction> referentialActions = new LinkedHashSet<>(2);
 
+    /**
+     * Attributes of a column REFERENCES clause; table constraints own their attributes on Index.
+     */
+    public ConstraintAttributes getConstraintAttributes() {
+        return constraintAttributes;
+    }
+
+    public void setConstraintAttributes(ConstraintAttributes constraintAttributes) {
+        this.constraintAttributes = constraintAttributes;
+    }
+
     /** Whether the final explicitly referenced column is prefixed with PERIOD. */
     public boolean isUsingPeriod() {
         return usingPeriod;
@@ -154,6 +166,9 @@ public String toString() {
             builder.append(" MATCH ").append(matchType);
         }
         referentialActions.forEach(builder::append);
+        if (constraintAttributes != null) {
+            constraintAttributes.appendTo(builder);
+        }
         return builder.toString();
     }
 }

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

@@ -21,7 +21,7 @@
 public class TableOption implements Serializable {
 
     public enum Kind {
-        ENGINE, CHARACTER_SET, COLLATE, COMMENT, AUTO_INCREMENT, STATS_AUTO_RECALC, STATS_PERSISTENT, STATS_SAMPLE_PAGES, UNION, OTHER
+        ENGINE, CHARACTER_SET, COLLATE, COMMENT, AUTO_INCREMENT, STATS_AUTO_RECALC, STATS_PERSISTENT, STATS_SAMPLE_PAGES, UNION, ENCRYPTION, PASSWORD, DATA_DIRECTORY, INDEX_DIRECTORY, OTHER
     }
 
     private Kind kind = Kind.OTHER;