Oracle Multi Column Drop (#1379)

Fixes #1363

Author: manticore-projects

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

@@ -388,6 +388,9 @@ public String toString() {
     } else if (operation== AlterOperation.DROP_FOREIGN_KEY) {
 
       b.append("DROP FOREIGN KEY (").append(PlainSelect.getStringList(pkColumns)).append(')');
+    } else if (operation== AlterOperation.DROP && columnName==null && pkColumns!=null && pkColumns.size()>0) {
+      // Oracle Multi Column Drop
+      b.append("DROP (").append(PlainSelect.getStringList(pkColumns)).append(')');
     } else {
         b.append(operation).append(" ");
 
@@ -471,16 +474,18 @@ public String toString() {
         } else if (index != null) {
           b.append(index);
         }
+
+
         if (getConstraints() != null && !getConstraints().isEmpty()) {
           b.append(' ').append(PlainSelect.getStringList(constraints, false, false));
         }
         if (getUseEqual()) {
           b.append('=');
         }
+    }
 
-        if (parameters != null && !parameters.isEmpty()) {
-          b.append(' ').append(PlainSelect.getStringList(parameters, 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

@@ -5584,9 +5584,30 @@ AlterExpression AlterExpression():
         <K_DROP> { alterExp.setOperation(AlterOperation.DROP);          }
         (
             (
-                ( LOOKAHEAD(2) <K_COLUMN> { alterExp.hasColumn(true); } )?
-                (tk=<S_IDENTIFIER>    | tk=<S_QUOTED_IDENTIFIER>) { alterExp.setColumnName(tk.image); }
-                [tk=<K_CASCADE> { alterExp.addParameters(tk.image); } ]
+                (
+                    // we use the PK Columns Field instead of the Column Field
+                    // for holding multiple DROP Columns
+                    columnNames=ColumnsNamesList() { alterExp.setPkColumns(columnNames); columnNames = null; }
+
+                    [ "INVALIDATE" { alterExp.addParameters("INVALIDATE"); } ]
+
+                    [
+                        "CASCADE" { alterExp.addParameters("CASCADE"); }
+                        [ "CONSTRAINTS" { alterExp.addParameters("CONSTRAINTS"); } ]
+                    ]
+                )
+                |
+                (
+                    ( LOOKAHEAD(2) <K_COLUMN> { alterExp.hasColumn(true); } )?
+                    (tk=<S_IDENTIFIER>    | tk=<S_QUOTED_IDENTIFIER>) { alterExp.setColumnName(tk.image); }
+
+                    [ "INVALIDATE" { alterExp.addParameters("INVALIDATE"); } ]
+
+                    [
+                        "CASCADE" { alterExp.addParameters("CASCADE"); }
+                        [ "CONSTRAINTS" { alterExp.addParameters("CONSTRAINTS"); } ]
+                    ]
+                )
             )
             |
             (

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

@@ -94,4 +94,10 @@ public void testDropSchemaIssue855() throws JSQLParserException {
     public void testDropSequence() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("DROP SEQUENCE mysequence");
     }
+
+    @Test
+    public void testOracleMultiColumnDrop() throws JSQLParserException {
+        //assertSqlCanBeParsedAndDeparsed("ALTER TABLE foo DROP (bar, baz)");
+        assertSqlCanBeParsedAndDeparsed("ALTER TABLE foo DROP (bar, baz) CASCADE");
+    }
 }