Merge pull request #179 from bgaborg/master

fixes #178

Author: wumpz

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

@@ -26,6 +26,7 @@
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.table.ColDataType;
+import net.sf.jsqlparser.statement.create.table.ForeignKeyIndex;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
 /**
@@ -40,6 +41,7 @@ public class Alter implements Statement {
     private List<String> pkColumns;
     private List<String> ukColumns;
     private String ukName;
+    private ForeignKeyIndex fkIndex = null;
 
     private boolean onDeleteCascade;
 
@@ -154,6 +156,14 @@ public void accept(StatementVisitor statementVisitor) {
         statementVisitor.visit(this);
     }
 
+    public ForeignKeyIndex getFkIndex() {
+        return fkIndex;
+    }
+
+    public void setFkIndex(ForeignKeyIndex fkIndex) {
+        this.fkIndex = fkIndex;
+    }
+
     @Override
     public String toString() {
         StringBuilder b = new StringBuilder();
@@ -165,15 +175,18 @@ public String toString() {
         } else if (ukColumns != null) {
             b.append("UNIQUE KEY ").append(ukName).append(" (").append(PlainSelect.getStringList(ukColumns)).append(")");
         } else if (fkColumns != null) {
-            b.append("FOREIGN KEY (").append(PlainSelect.getStringList(fkColumns)).append(") REFERENCES ").append(fkSourceTable).append(" (").append(PlainSelect.getStringList(fkSourceColumns)).append(")");
+            b.append("FOREIGN KEY (").append(PlainSelect.getStringList(fkColumns)).append(") REFERENCES ").append(fkSourceTable).append(" (").append(
+				PlainSelect.getStringList(fkSourceColumns)).append(")");
             if (isOnDeleteCascade()) {
                 b.append(" ON DELETE CASCADE");
             } else if (isOnDeleteRestrict()) {
                 b.append(" ON DELETE RESTRICT");
             } else if (isOnDeleteSetNull()) {
                 b.append(" ON DELETE SET NULL");
             }
-        }
-        return b.toString();
+		} else if (fkIndex != null) {
+			b.append(fkIndex);
+		}
+		return b.toString();
     }
 }

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

@@ -2748,8 +2748,12 @@ Alter Alter():
 	Alter alter = new Alter();
 	Table table;
 	Token tk;
+	Token tk2 = null;
+    String sk3 = null;
 	ColDataType dataType;
     List<String> columnNames = null;
+    ForeignKeyIndex fkIndex = null;
+    Table fkTable = null;
 }
 {
 	<K_ALTER> <K_TABLE> table=Table() { alter.setTable(table); } 
@@ -2772,10 +2776,29 @@ Alter Alter():
         ( <K_FOREIGN> <K_KEY> columnNames=ColumnsNamesList() { alter.setFkColumns(columnNames); }
              <K_REFERENCES> tk=<S_IDENTIFIER> columnNames=ColumnsNamesList() 
                     { alter.setFkSourceTable(tk.image); alter.setFkSourceColumns(columnNames); }
-            [<K_ON> <K_DELETE> 
-                (<K_CASCADE> { alter.setOnDeleteCascade(true); }
-                | <K_RESTRICT> { alter.setOnDeleteRestrict(true); }
-                | <K_SET> <K_NULL> { alter.setOnDeleteSetNull(true); } ) ] 
+            [<K_ON> <K_DELETE>
+                            (<K_CASCADE> { alter.setOnDeleteCascade(true); }
+                            | <K_RESTRICT> { alter.setOnDeleteRestrict(true); }
+                            | <K_SET> <K_NULL> { alter.setOnDeleteSetNull(true); } ) ]
+        )
+        |
+        (
+            {
+                fkIndex = new ForeignKeyIndex();
+            }
+            [<K_CONSTRAINT> sk3=RelObjectName() {fkIndex.setName(sk3);} ]
+            tk=<K_FOREIGN> tk2=<K_KEY>
+                columnNames=ColumnsNamesList()
+                {
+                    fkIndex.setType(tk.image + " " + tk2.image);
+                    fkIndex.setColumnsNames(columnNames);
+                }
+                <K_REFERENCES> fkTable=Table() columnNames=ColumnsNamesList()
+                {
+                    fkIndex.setTable(fkTable);
+                    fkIndex.setReferencedColumnNames(columnNames);
+                    alter.setFkIndex(fkIndex);
+                }
         )
     )
 

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

@@ -34,6 +34,10 @@ public void testAlterTableUniqueKey() throws JSQLParserException {
     public void testAlterTableForgeignKey() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("ALTER TABLE test ADD FOREIGN KEY (user_id) REFERENCES ra_user (id) ON DELETE CASCADE");
     }
+
+	public void testAlterTableAddConstraint() throws JSQLParserException {
+		assertSqlCanBeParsedAndDeparsed("ALTER TABLE RESOURCELINKTYPE ADD CONSTRAINT FK_RESOURCELINKTYPE_PARENTTYPE_PRIMARYKEY FOREIGN KEY (PARENTTYPE_PRIMARYKEY) REFERENCES RESOURCETYPE(PRIMARYKEY)");
+	}
 
     public void testAlterTableForgeignKey2() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("ALTER TABLE test ADD FOREIGN KEY (user_id) REFERENCES ra_user (id)");