Added support for comment(s) for column definitions in CREATE TABLE s… (#743)

* Added support for comment(s) for column definitions in CREATE TABLE statements

* Added support for comment(s) for column definitions in CREATE TABLE statements #2

* To increase code coverage

* To increase code coverage #2

Author: PraTrick

src/main/java/net/sf/jsqlparser/schema/Table.java

@@ -51,19 +51,18 @@ public Table() {
     }
 
     public Table(String name) {
-        setIndex(NAME_IDX, name);
+        setName(name);
     }
 
     public Table(String schemaName, String name) {
-        setIndex(NAME_IDX, name);
-        setIndex(SCHEMA_IDX, schemaName);
+        setName(name);
+        setSchemaName(schemaName);
     }
 
     public Table(Database database, String schemaName, String name) {
-        setIndex(NAME_IDX, name);
-        setIndex(SCHEMA_IDX, schemaName);
-        setIndex(DATABASE_IDX, database.getDatabaseName());
-        setIndex(SERVER_IDX, database.getServer().getFullyQualifiedName());
+        setName(name);
+        setSchemaName(schemaName);
+        setDatabase(database);
     }
 
     public Table(List<String> partItems) {
@@ -77,6 +76,7 @@ public Database getDatabase() {
 
     public void setDatabase(Database database) {
         setIndex(DATABASE_IDX, database.getDatabaseName());
+        setIndex(SERVER_IDX, database.getServer().getFullyQualifiedName());
     }
 
     public String getSchemaName() {
@@ -173,3 +173,4 @@ public String toString() {
                 + ((hint != null) ? hint.toString() : "");
     }
 }
+

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

@@ -3584,6 +3584,8 @@ List<String> CreateParameter():
             tk=<K_IN> { param.add(tk.image); }
 			|
             tk=<K_TYPE> { param.add(tk.image); }
+			|
+            tk=<K_COMMENT> { param.add(tk.image); }
         )
     {return param;}
 }

src/test/java/net/sf/jsqlparser/parser/CCJSqlParserUtilTest.java

@@ -128,4 +128,17 @@ public void testParseStatementsIssue691_2() throws Exception {
                 + "---test");
         assertEquals("SELECT * FROM dual;\n", result.toString());
     }
+
+    @Test
+    public void testParseStatementIssue742() throws Exception {
+        Statements result = CCJSqlParserUtil.parseStatements("CREATE TABLE `table_name` (\n" +
+                "  `id` bigint(20) NOT NULL AUTO_INCREMENT,\n" +
+                "  `another_column_id` bigint(20) NOT NULL COMMENT 'column id as sent by SYSTEM',\n" +
+                "  PRIMARY KEY (`id`),\n" +
+                "  UNIQUE KEY `uk_another_column_id` (`another_column_id`)\n" +
+                ")");
+        assertEquals("CREATE TABLE `table_name` (`id` bigint (20) NOT NULL AUTO_INCREMENT, `another_column_id` " +
+                "bigint (20) NOT NULL COMMENT 'column id as sent by SYSTEM', PRIMARY KEY (`id`), UNIQUE KEY `uk_another_column_id` " +
+                "(`another_column_id`));\n", result.toString());
+    }
 }