create table can now have foreign key definitions

fixes #14

Author: wumpz

README.md

@@ -15,6 +15,12 @@ Original project websites:
 
 ## Extensions Version 0.8.4
 
+* Added support for foreign keys in create table statements
+
+```sql
+create table testTable1 (a varchar(10), b varchar(20), foreign key a references testTable2(a))
+create table testTable1 (a varchar(10), b varchar(20), constraint fkIdx foreign key a references testTable2(a))
+```
 * Added support for simple intervals
 
 ```sql

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

@@ -68,6 +68,6 @@ public void setColumnName(String string) {
 
 	@Override
 	public String toString() {
-		return columnName + " " + colDataType + " " + PlainSelect.getStringList(columnSpecStrings, false, false);
+		return columnName + " " + colDataType + (columnSpecStrings != null ? " " + PlainSelect.getStringList(columnSpecStrings, false, false) : "");
 	}
 }

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

@@ -0,0 +1,58 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2013 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.create.table;
+
+import java.util.List;
+import net.sf.jsqlparser.schema.Table;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+
+/**
+ * Foreign Key Index
+ * @author toben
+ */
+public class ForeignKeyIndex extends Index {
+	private Table table;
+	private List<String> referencedColumnNames;
+
+	public Table getTable() {
+		return table;
+	}
+
+	public void setTable(Table table) {
+		this.table = table;
+	}
+
+	public List<String> getReferencedColumnNames() {
+		return referencedColumnNames;
+	}
+
+	public void setReferencedColumnNames(List<String> referencedColumnNames) {
+		this.referencedColumnNames = referencedColumnNames;
+	}
+
+	@Override
+	public String toString() {
+		return (getName()!=null?"CONSTRAINT " + getName() + " ":"") 
+				+  getType() + " " + PlainSelect.getStringList(getColumnsNames(), true, true) 
+				+ " REFERENCES " + table + PlainSelect.getStringList(getReferencedColumnNames(), true, true);
+	}
+}

src/main/java/net/sf/jsqlparser/util/deparser/CreateTableDeParser.java

@@ -59,32 +59,19 @@ public void deParse(CreateTable createTable) {
 				}
 
 				if (iter.hasNext()) {
-					buffer.append(" , ");
+					buffer.append(", ");
 				}
-
 			}
 
 			if (createTable.getIndexes() != null) {
 				for (Iterator<Index> iter = createTable.getIndexes().iterator(); iter.hasNext();) {
-					buffer.append(",");
+					buffer.append(", ");
 					Index index = iter.next();
-					buffer.append(index.getType()).append(" ").append(index.getName());
-					buffer.append("(");
-					for (Iterator<String> iterator = index.getColumnsNames().iterator(); iterator.hasNext();) {
-						buffer.append(iterator.next());
-						if (iterator.hasNext()) {
-							buffer.append(", ");
-						}
-					}
-					buffer.append(")");
-
-					if (iter.hasNext()) {
-						buffer.append(",");
-					}
+					buffer.append(index.toString());
 				}
 			}
 
-			buffer.append(" )");
+			buffer.append(")");
 		}
 	}
 

src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj

@@ -115,6 +115,7 @@ import net.sf.jsqlparser.statement.create.table.ColumnDefinition;
 import net.sf.jsqlparser.statement.create.table.CreateTable;
 import net.sf.jsqlparser.statement.create.view.CreateView;
 import net.sf.jsqlparser.statement.create.table.Index;
+import net.sf.jsqlparser.statement.create.table.ForeignKeyIndex;
 import net.sf.jsqlparser.statement.delete.Delete;
 import net.sf.jsqlparser.statement.drop.Drop;
 import net.sf.jsqlparser.statement.insert.Insert;
@@ -241,6 +242,9 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |	<K_LATERAL:"LATERAL">
 |	<K_MATERIALIZED:"MATERIALIZED">
 |   <K_INTERVAL:"INTERVAL">
+|	<K_FOREIGN:"FOREIGN">
+|	<K_CONSTRAINT:"CONSTRAINT">
+|	<K_REFERENCES:"REFERENCES">
 }
 
 
@@ -1806,7 +1810,9 @@ CreateTable CreateTable():
 	List indexes = new ArrayList();
 	List colNames = null;
 	Index index = null;
+	ForeignKeyIndex fkIndex = null;
 	String parameter = null;
+	Table fkTable = null;
 }
 {
 	<K_CREATE> 
@@ -1878,6 +1884,25 @@ CreateTable CreateTable():
 						}
 				)
 				|
+				(	
+					{ 
+						fkIndex = new ForeignKeyIndex(); 
+					}
+					[<K_CONSTRAINT> tk3=<S_IDENTIFIER> {fkIndex.setName(tk3.image);} ]
+					tk=<K_FOREIGN> tk2=<K_KEY>		
+						colNames=ColumnsNamesList()
+						{ 
+							fkIndex.setType(tk.image + " " + tk2.image);
+							fkIndex.setColumnsNames(colNames);
+						}
+						<K_REFERENCES> fkTable=Table() colNames=ColumnsNamesList()
+						{
+							fkIndex.setTable(fkTable);
+							fkIndex.setReferencedColumnNames(colNames);
+							indexes.add(fkIndex);
+						}
+				)
+				|
 				(
 					(columnName=<S_IDENTIFIER>
 					|

src/test/java/net/sf/jsqlparser/test/create/CreateTableTest.java

@@ -27,12 +27,12 @@ public CreateTableTest(String arg0) {
 	}
 
 	public void testCreateTable2() throws JSQLParserException {
-		String statement = "CREATE TABLE testtab (\"test\" varchar (255) )";
+		String statement = "CREATE TABLE testtab (\"test\" varchar (255))";
 		assertSqlCanBeParsedAndDeparsed(statement);
 	}
 
 	public void testCreateTable3() throws JSQLParserException {
-		String statement = "CREATE TABLE testtab (\"test\" varchar (255) , \"test\" varchar (255) )";
+		String statement = "CREATE TABLE testtab (\"test\" varchar (255), \"test2\" varchar (255))";
 		assertSqlCanBeParsedAndDeparsed(statement);
 	}
 
@@ -47,6 +47,16 @@ public void testCreateTable() throws JSQLParserException {
 		assertEquals("mycol", ((Index) createTable.getIndexes().get(0)).getColumnsNames().get(1));
 		assertEquals(statement, "" + createTable);
 	}
+	
+	public void testCreateTableForeignKey() throws JSQLParserException {
+		String statement = "CREATE TABLE test (id INT UNSIGNED NOT NULL AUTO_INCREMENT, string VARCHAR (20), user_id INT UNSIGNED, PRIMARY KEY (id), FOREIGN KEY (user_id) REFERENCES ra_user(id))";
+		assertSqlCanBeParsedAndDeparsed(statement);
+	}
+	
+	public void testCreateTableForeignKey2() throws JSQLParserException {
+		String statement = "CREATE TABLE test (id INT UNSIGNED NOT NULL AUTO_INCREMENT, string VARCHAR (20), user_id INT UNSIGNED, PRIMARY KEY (id), CONSTRAINT fkIdx FOREIGN KEY (user_id) REFERENCES ra_user(id))";
+		assertSqlCanBeParsedAndDeparsed(statement);
+	}
 
 	public void testRUBiSCreateList() throws Exception {
 		BufferedReader in = new BufferedReader(new InputStreamReader(CreateTableTest.class.getResourceAsStream("/RUBiS-create-requests.txt")));