Fix #407 by enhancing grammar (#410)

* Fix #407 by enhancing grammar

* Change LF and tabs

Author: cmoine

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

@@ -22,14 +22,14 @@
 package net.sf.jsqlparser.statement.alter;
 
 
-import net.sf.jsqlparser.statement.create.table.ColDataType;
-import net.sf.jsqlparser.statement.create.table.Index;
-import net.sf.jsqlparser.statement.select.PlainSelect;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import net.sf.jsqlparser.statement.create.table.ColDataType;
+import net.sf.jsqlparser.statement.create.table.Index;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+
 /**
  *
  * @author toben & wrobstory
@@ -53,6 +53,8 @@ public class AlterExpression {
     private List<String> fkColumns;
     private String fkSourceTable;
     private List<String> fkSourceColumns;
+    
+    private List<ConstraintState> constraints;
 
     public AlterOperation getOperation() {
         return operation;
@@ -173,6 +175,14 @@ public void setIndex(Index index) {
         this.index = index;
     }
 
+    public List<ConstraintState> getConstraints() {
+        return constraints;
+    }
+
+    public void setConstraints(List<ConstraintState> constraints) {
+        this.constraints = constraints;
+    }
+
     @Override
     public String toString() {
 
@@ -193,7 +203,9 @@ public String toString() {
         } else if (constraintName != null) {
             b.append("CONSTRAINT ").append(constraintName);
         } else if (pkColumns != null) {
-            b.append("PRIMARY KEY (").append(PlainSelect.getStringList(pkColumns)).append(")");
+            b.append("PRIMARY KEY (").append(PlainSelect.getStringList(pkColumns)).append(')');
+            if(getConstraints()!=null && !getConstraints().isEmpty())
+                b.append(' ').append(PlainSelect.getStringList(constraints, false, false));
         } else if (ukColumns != null) {
             b.append("UNIQUE KEY ").append(ukName).append(" (").append(PlainSelect.getStringList(ukColumns)).append(")");
         } else if (fkColumns != null) {

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

@@ -0,0 +1,30 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2017 JSQLParser
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.statement.alter;
+
+/**
+ * Based on https://docs.oracle.com/cd/B28359_01/server.111/b28286/clauses002.htm#i1002273
+ * 
+ * @author Christophe Moine
+ */
+public interface ConstraintState {
+}

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

@@ -0,0 +1,48 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2017 JSQLParser
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.statement.alter;
+
+public class DeferrableConstraint implements ConstraintState {
+    private boolean not;
+
+    public DeferrableConstraint(boolean not) {
+        this.not = not;
+    }
+
+    public boolean isNot() {
+        return not;
+    }
+
+    public void setNot(boolean not) {
+        this.not = not;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder b = new StringBuilder();
+        if(not) {
+            b.append("NOT ");
+        }
+        b.append("DEFERRABLE");
+        return b.toString();
+    }
+}

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

@@ -0,0 +1,43 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2017 JSQLParser
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.statement.alter;
+
+public class EnableConstraint implements ConstraintState {
+    private boolean disable;
+
+    public EnableConstraint(boolean disable) {
+        this.disable = disable;
+    }
+
+    public boolean isDisable() {
+        return disable;
+    }
+
+    public void setDisable(boolean disable) {
+        this.disable = disable;
+    }
+
+    @Override
+    public String toString() {
+        return disable ? "DISABLE" : "ENABLE";
+    }
+}

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

@@ -0,0 +1,43 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2017 JSQLParser
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.statement.alter;
+
+public class ValidateConstraint implements ConstraintState {
+    private boolean not;
+
+    public ValidateConstraint(boolean not) {
+        this.not = not;
+    }
+
+    public boolean isNot() {
+        return not;
+    }
+
+    public void setNot(boolean not) {
+        this.not = not;
+    }
+
+    @Override
+    public String toString() {
+        return not ? "NOVALIDATE" : "VALIDATE";
+    }
+}