Support table option character set and index options (#1586)

* Support table option character set and index options

Signed-off-by: luofei <luoffei@outlook.com>

* move test

Signed-off-by: luofei <luoffei@outlook.com>

Author: luoffei

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

@@ -5014,8 +5014,10 @@ CreateTable CreateTable():
                             sk3=RelObjectName()
                             /* colNames=ColumnsNamesList() */
                             colNames = ColumnNamesWithParamsList()
+                            { idxSpec.clear(); }
+                            ( parameter=CreateParameter() { idxSpec.addAll(parameter); } )*
                             {
-                                index = new Index().withType(tk.image).withName(sk3).withColumns(colNames);
+                                index = new Index().withType(tk.image).withName(sk3).withColumns(colNames).withIndexSpec(idxSpec);
                                 indexes.add(index);
                             }
                     )
@@ -5031,6 +5033,7 @@ CreateTable CreateTable():
                          )
                             /* colNames=ColumnsNamesList() */
                             colNames = ColumnNamesWithParamsList()
+                            { idxSpec.clear(); }
                             ( parameter=CreateParameter() { idxSpec.addAll(parameter); } )*
                             {
                                 index.withColumns(colNames).withIndexSpec(idxSpec);
@@ -5047,6 +5050,7 @@ CreateTable CreateTable():
                             sk3=RelObjectName()
                             /* colNames=ColumnsNamesList() */
                             colNames = ColumnNamesWithParamsList()
+                            { idxSpec.clear(); }
                             ( parameter=CreateParameter() { idxSpec.addAll(parameter); } )*
                             {
                                 index = new Index()
@@ -5364,6 +5368,8 @@ List<String> CreateParameter():
             |
             tk=<K_BINARY> { param.add(tk.image); }
             |
+            (tk=<K_CHARACTER> tk2=<K_SET>) { param.add(tk.image); param.add(tk2.image);}
+            |
             (<K_ARRAY_LITERAL> exp=ArrayConstructor(true)) { param.add(exp.toString()); }
             |
 	    tk="::" colDataType = ColDataType() { param.add(tk.image); param.add(colDataType.toString()); }

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

@@ -861,4 +861,34 @@ public void testCreateUnionIssue1309() throws JSQLParserException {
     public void testCreateTableBinaryIssue1518() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("CREATE TABLE `s` (`a` enum ('a', 'b', 'c') CHARACTER SET binary COLLATE binary)");
     }
+
+    @Test
+    public void testCreateTableIssue1488() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("CREATE TABLE u_call_record (\n" +
+                 "card_user_id int(11) NOT NULL,\n" +
+                 "device_id int(11) NOT NULL,\n" +
+                 "call_start_at int(11) NOT NULL DEFAULT CURRENT_TIMESTAMP(11),\n" +
+                 "card_user_name varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,\n" +
+                 "sim_id varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,\n" +
+                 "called_number varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,\n" +
+                 "called_nickname varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,\n" +
+                 "talk_time smallint(8) NULL DEFAULT NULL,\n" +
+                 "area_name varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,\n" +
+                 "area_service_id int(11) NULL DEFAULT NULL,\n" +
+                 "operator_id int(4) NULL DEFAULT NULL,\n" +
+                 "status tinyint(4) NULL DEFAULT NULL,\n" +
+                 "create_at timestamp NULL DEFAULT NULL,\n" +
+                 "place_user varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,\n" +
+                 "PRIMARY KEY (card_user_id, device_id, call_start_at) USING BTREE,\n" +
+                 "INDEX ucr_index_area_name(area_name) USING BTREE,\n" +
+                 "INDEX ucr_index_area_service_id(area_service_id) USING BTREE,\n" +
+                 "INDEX ucr_index_called_number(called_number) USING BTREE,\n" +
+                 "INDEX ucr_index_create_at(create_at) USING BTREE,\n" +
+                 "INDEX ucr_index_operator_id(operator_id) USING BTREE,\n" +
+                 "INDEX ucr_index_place_user(place_user) USING BTREE,\n" +
+                 "INDEX ucr_index_sim_id(sim_id) USING BTREE,\n" +
+                 "INDEX ucr_index_status(status) USING BTREE,\n" +
+                 "INDEX ucr_index_talk_time(talk_time) USING BTREE\n" +
+                 ") ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic", true);
+    }
 }