support for named pks included

Author: wumpz

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

@@ -29,7 +29,7 @@
  * Foreign Key Index
  * @author toben
  */
-public class ForeignKeyIndex extends Index {
+public class ForeignKeyIndex extends NamedConstraint {
 	private Table table;
 	private List<String> referencedColumnNames;
 
@@ -51,8 +51,7 @@ public void setReferencedColumnNames(List<String> referencedColumnNames) {
 
 	@Override
 	public String toString() {
-		return (getName()!=null?"CONSTRAINT " + getName() + " ":"") 
-				+  getType() + " " + PlainSelect.getStringList(getColumnsNames(), true, true) 
+		return super.toString()
 				+ " REFERENCES " + table + PlainSelect.getStringList(getReferencedColumnNames(), true, true);
 	}
 }

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

@@ -0,0 +1,55 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2014 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%
+ */
+/*
+ * Copyright (C) 2014 JSQLParser.
+ *
+ * This library 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 library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+
+package net.sf.jsqlparser.statement.create.table;
+
+import net.sf.jsqlparser.statement.select.PlainSelect;
+
+/**
+ *
+ * @author toben
+ */
+public class NamedConstraint extends Index {
+    @Override
+	public String toString() {
+		return (getName()!=null?"CONSTRAINT " + getName() + " ":"") 
+				+  getType() + " " + PlainSelect.getStringList(getColumnsNames(), true, true);
+	}
+}

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

@@ -2036,12 +2036,15 @@ CreateTable CreateTable():
 						}
 				)
 				|
-				(
+				LOOKAHEAD(3) (
+                    {
+                        index = new NamedConstraint();
+                    }
+                    [<K_CONSTRAINT> tk3=<S_IDENTIFIER> {index.setName(tk3.image);} ]
 					tk=<K_PRIMARY> tk2=<K_KEY>
 						colNames=ColumnsNamesList()
 						{
-							index = new Index();
-							index.setType(tk.image + " "+ tk2.image);
+							index.setType(tk.image + " " + tk2.image);
 							index.setColumnsNames(colNames);
 							indexes.add(index);
 						}

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

@@ -57,6 +57,11 @@ 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 testCreateTablePrimaryKey() throws JSQLParserException {
+		String statement = "CREATE TABLE test (id INT UNSIGNED NOT NULL AUTO_INCREMENT, string VARCHAR (20), user_id INT UNSIGNED, CONSTRAINT pk_name PRIMARY KEY (id))";
+		assertSqlCanBeParsedAndDeparsed(statement);
+	}
 
 	public void testRUBiSCreateList() throws Exception {
 		BufferedReader in = new BufferedReader(new InputStreamReader(CreateTableTest.class.getResourceAsStream("/RUBiS-create-requests.txt")));