fixed #491

Author: wumpz

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

@@ -3105,8 +3105,8 @@ List<String> CreateParameter():
 }
 {
         (
-            ((tk=<S_IDENTIFIER> { identifier.append(tk.image); }
-                ["." tk2=<S_IDENTIFIER> { identifier.append("."); identifier.append(tk2.image); }])
+            (((tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER>) { identifier.append(tk.image); }
+                ["." (tk2=<S_IDENTIFIER> | tk2=<S_QUOTED_IDENTIFIER>) { identifier.append("."); identifier.append(tk2.image); }])
                 { param.add(identifier.toString()); })
             |
             tk=<K_NULL> { param.add(tk.image); }
@@ -3178,7 +3178,7 @@ String AList():
 {
      "("
 
-     ( (tk=<S_LONG> | tk=<S_DOUBLE> | tk=<S_CHAR_LITERAL> | tk=<S_IDENTIFIER>) { retval.append(tk.image); }
+     ( (tk=<S_LONG> | tk=<S_DOUBLE> | tk=<S_CHAR_LITERAL> | tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER>) { retval.append(tk.image); }
        [("," {retval.append(",");} | "=" {retval.append("=");})] )*
 
     ")"

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

@@ -268,6 +268,14 @@ public void testTimestampWithTimezone() throws JSQLParserException {
     public void testCreateTableAsSelect3() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("CREATE TABLE public.sales1 AS (SELECT * FROM public.sales)");
     }
+    
+    public void testQuotedPKColumnsIssue491() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("CREATE TABLE `FOO` (`ID` INT64, `NAME` STRING (100)) PRIMARY KEY (`ID`)");
+    }
+    
+    public void testQuotedPKColumnsIssue491_2() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("CREATE TABLE `FOO` (`ID` INT64, `NAME` STRING (100), PRIMARY KEY (`ID`))");
+    }
 
     public void testRUBiSCreateList() throws Exception {
         BufferedReader in = new BufferedReader(new InputStreamReader(CreateTableTest.class.