fixes #510

Author: wumpz

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

@@ -22,6 +22,7 @@
 package net.sf.jsqlparser.statement.alter;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -54,6 +55,7 @@ public class AlterExpression {
     private List<String> fkSourceColumns;
 
     private List<ConstraintState> constraints;
+    private List<String> parameters;
 
     public AlterOperation getOperation() {
         return operation;
@@ -182,6 +184,17 @@ public void setConstraints(List<ConstraintState> constraints) {
         this.constraints = constraints;
     }
 
+    public void addParameters(String... params) {
+        if (parameters == null) {
+            parameters = new ArrayList<String>();
+        }
+        parameters.addAll(Arrays.asList(params));
+    }
+
+    public List<String> getParameters() {
+        return parameters;
+    }
+
     @Override
     public String toString() {
 
@@ -225,6 +238,9 @@ public String toString() {
         if (getConstraints() != null && !getConstraints().isEmpty()) {
             b.append(' ').append(PlainSelect.getStringList(constraints, false, false));
         }
+        if (parameters!=null && !parameters.isEmpty()) {
+            b.append(' ').append(PlainSelect.getStringList(parameters, false, false));
+        }
 
         return b.toString();
     }

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -3250,7 +3250,7 @@ Drop Drop():
     [<K_IF> <K_EXISTS> {drop.setIfExists(true);} ]
 
     name = Table() { drop.setName(name); }
-    ((tk=<S_IDENTIFIER> | tk=<K_CASCADE>) { dropArgs.add(tk.image); })*
+    ((tk=<S_IDENTIFIER> | tk=<K_CASCADE> | tk=<K_RESTRICT> ) { dropArgs.add(tk.image); })*
 
     {
         if (dropArgs.size() > 0)
@@ -3418,10 +3418,12 @@ AlterExpression AlterExpression():
         }
          (
              (  <K_COLUMN>
-             (tk=<S_IDENTIFIER>    | tk=<S_QUOTED_IDENTIFIER>)
+                (tk=<S_IDENTIFIER>    | tk=<S_QUOTED_IDENTIFIER>)
                      {
                             alterExp.setColumnName(tk.image);
                      }
+                [tk=<K_CASCADE> { alterExp.addParameters(tk.image); } ]
+                  
              )
              |
        (  <K_CONSTRAINT>

src/test/java/net/sf/jsqlparser/test/alter/AlterTest.java

@@ -240,5 +240,8 @@ public void testAlterTableAddColumnKeywordTypes() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("ALTER TABLE mytable ADD COLUMN col1 interval");
         assertSqlCanBeParsedAndDeparsed("ALTER TABLE mytable ADD COLUMN col1 bit varying");
     }
-
+    
+    public void testDropColumnRestrictIssue510() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("ALTER TABLE TABLE1 DROP COLUMN NewColumn CASCADE");
+    }
 }

src/test/java/net/sf/jsqlparser/test/drop/DropTest.java

@@ -40,4 +40,9 @@ public void testDrop2() throws JSQLParserException {
     public void testDropIfExists() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("DROP TABLE IF EXISTS my_table");
     }
+    
+    @Test
+    public void testDropRestrictIssue510() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("DROP TABLE TABLE2 RESTRICT");
+    }
 }