bug fixed for sql parser. for issue #1910

src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest14.java

@@ -53,7 +53,7 @@ public class MySqlCreateTableTest14 extends MysqlTest {
                 + "\n\tPRIMARY KEY (`ID`),"
                 + "\n\tKEY `quizId` USING BTREE (`QuizID`),"
                 + "\n\tKEY `optionId` USING BTREE (`OptionID`)"
-                + "\n) ENGINE = InnoDB CHARSET = gbk COMMENT = ''", //
+                + "\n) ENGINE = InnoDB CHARSET = gbk COMMENT ''", //
                             SQLUtils.toMySqlString(stmt));
         Assert.assertEquals("create table `OptionList` ("
                 + "\n\t`ID` int(11) not null auto_increment,"
@@ -64,7 +64,7 @@ public class MySqlCreateTableTest14 extends MysqlTest {
                 + "\n\tprimary key (`ID`),"
                 + "\n\tkey `quizId` using BTREE (`QuizID`),"
                 + "\n\tkey `optionId` using BTREE (`OptionID`)"
-                + "\n) engine = InnoDB charset = gbk comment = ''", //
+                + "\n) engine = InnoDB charset = gbk comment ''", //
                             SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION));
 
         Assert.assertEquals(1, statementList.size());

src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest50.java

@@ -53,7 +53,7 @@ public class MySqlCreateTableTest50 extends MysqlTest {
         Assert.assertEquals("CREATE TABLE `test`.`a` (" //
                             + "\n\t`ida` INT NOT NULL COMMENT 'aaa',"//
                             + "\n\tPRIMARY KEY (`ida`)"//
-                            + "\n) COMMENT = 'bb'",//
+                            + "\n) COMMENT 'bb'",//
                             output);
 
     }

src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest52.java

@@ -64,6 +64,6 @@ public class MySqlCreateTableTest52 extends MysqlTest {
     +"\n\t`create_time` datetime NOT NULL COMMENT '授权时间',"//
     +"\n\t`invalid_time` datetime NOT NULL COMMENT '授权失效时间',"//
     +"\n\tPRIMARY KEY (`auth_id`)"
-    +"\n) ENGINE = InnoDB CHARSET = utf8 COLLATE utf8_bin COMMENT = 'INS_EBAY_AUTH'", output);
+    +"\n) ENGINE = InnoDB CHARSET = utf8 COLLATE utf8_bin COMMENT 'INS_EBAY_AUTH'", output);
     }
 }

src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest53.java

@@ -66,7 +66,7 @@ public class MySqlCreateTableTest53 extends MysqlTest {
     +"\n\t`create_time` datetime NOT NULL COMMENT '授权时间',"//
     +"\n\t`invalid_time` datetime NOT NULL COMMENT '授权失效时间',"//
     +"\n\tPRIMARY KEY USING BTREE (`auth_id`)"
-    +"\n) ENGINE = InnoDB CHARSET = utf8 COLLATE utf8_bin COMMENT = 'INS_EBAY_AUTH'", output);
+    +"\n) ENGINE = InnoDB CHARSET = utf8 COLLATE utf8_bin COMMENT 'INS_EBAY_AUTH'", output);
     }
     
     @Test
@@ -109,7 +109,7 @@ public class MySqlCreateTableTest53 extends MysqlTest {
     +"\n\t`invalid_time` datetime NOT NULL COMMENT '授权失效时间',"//
     +"\n\tPRIMARY KEY USING BTREE (`auth_id`),"
     +"\n\tINDEX `ind_usr_id` USING BTREE(`usr_id`)"
-    +"\n) ENGINE = InnoDB CHARSET = utf8 COLLATE utf8_bin COMMENT = 'INS_EBAY_AUTH'", output);
+    +"\n) ENGINE = InnoDB CHARSET = utf8 COLLATE utf8_bin COMMENT 'INS_EBAY_AUTH'", output);
     }
     
     @Test
@@ -152,6 +152,6 @@ public class MySqlCreateTableTest53 extends MysqlTest {
     +"\n\t`invalid_time` datetime NOT NULL COMMENT '授权失效时间',"//
     +"\n\tPRIMARY KEY USING BTREE (`auth_id`),"
     +"\n\tKEY `ind_usr_id` USING BTREE (`usr_id`)"
-    +"\n) ENGINE = InnoDB CHARSET = utf8 COLLATE utf8_bin COMMENT = 'INS_EBAY_AUTH'", output);
+    +"\n) ENGINE = InnoDB CHARSET = utf8 COLLATE utf8_bin COMMENT 'INS_EBAY_AUTH'", output);
     }
 }

src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest71.java

@@ -51,7 +51,7 @@ public class MySqlCreateTableTest71 extends MysqlTest {
                     + "\n\tgmt_create datetime NOT NULL COMMENT '创建时间',"
                     + "\n\tgmt_modified datetime NOT NULL COMMENT '修改时间',"
                     + "\n\tPRIMARY KEY (id)"
-                    + "\n) COMMENT = 're'", output);
+                    + "\n) COMMENT 're'", output);
         }
         
         {
@@ -61,7 +61,7 @@ public class MySqlCreateTableTest71 extends MysqlTest {
                     + "\n\tgmt_create datetime not null comment '创建时间',"
                     + "\n\tgmt_modified datetime not null comment '修改时间',"
                     + "\n\tprimary key (id)"
-                    + "\n) comment = 're'", output);
+                    + "\n) comment 're'", output);
         }
     }
 }

src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest75.java

@@ -80,7 +80,7 @@ public class MySqlCreateTableTest75 extends MysqlTest {
                     "\tKEY `k_rid_aid_tid` (`receiver_id`, `app_id`, `type_id`, `expiration_date`),\n" +
                     "\tKEY `k_rid_stat_popup` (`receiver_id`, `status`, `popup`, `expiration_date`),\n" +
                     "\tKEY `k_tid` (`tag_id`)\n" +
-                    ") ENGINE = InnoDB AUTO_INCREMENT = 167279613030 CHARSET = gbk COMMENT = '消息实体表'", output);
+                    ") ENGINE = InnoDB AUTO_INCREMENT = 167279613030 CHARSET = gbk COMMENT '消息实体表'", output);
         }
         
         {
@@ -104,7 +104,7 @@ public class MySqlCreateTableTest75 extends MysqlTest {
                     "\tkey `k_rid_aid_tid` (`receiver_id`, `app_id`, `type_id`, `expiration_date`),\n" +
                     "\tkey `k_rid_stat_popup` (`receiver_id`, `status`, `popup`, `expiration_date`),\n" +
                     "\tkey `k_tid` (`tag_id`)\n" +
-                    ") engine = InnoDB auto_increment = 167279613030 charset = gbk comment = '消息实体表'", output);
+                    ") engine = InnoDB auto_increment = 167279613030 charset = gbk comment '消息实体表'", output);
         }
     }
 }

src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest76.java

@@ -80,7 +80,7 @@ public class MySqlCreateTableTest76 extends MysqlTest {
                     "\tKEY `k_rid_aid_tid` (`receiver_id`, `app_id`, `type_id`, `expiration_date`),\n" +
                     "\tKEY `k_rid_stat_popup` (`receiver_id`, `status`, `popup`, `expiration_date`),\n" +
                     "\tKEY `k_tid` (`tag_id`)\n" +
-                    ") ENGINE = InnoDB AUTO_INCREMENT = 167279613030 CHARSET = gbk COMMENT = '消息实体表'", output);
+                    ") ENGINE = InnoDB AUTO_INCREMENT = 167279613030 CHARSET = gbk COMMENT '消息实体表'", output);
         }
         
         {
@@ -104,7 +104,7 @@ public class MySqlCreateTableTest76 extends MysqlTest {
                     "\tkey `k_rid_aid_tid` (`receiver_id`, `app_id`, `type_id`, `expiration_date`),\n" +
                     "\tkey `k_rid_stat_popup` (`receiver_id`, `status`, `popup`, `expiration_date`),\n" +
                     "\tkey `k_tid` (`tag_id`)\n" +
-                    ") engine = InnoDB auto_increment = 167279613030 charset = gbk comment = '消息实体表'", output);
+                    ") engine = InnoDB auto_increment = 167279613030 charset = gbk comment '消息实体表'", output);
         }
     }
 }

src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest79_collate.java

@@ -43,7 +43,7 @@ public class MySqlCreateTableTest79_collate extends MysqlTest {
                     "\tcustom_vip_show_message_seq INT(11) NOT NULL AUTO_INCREMENT,\n" +
                     "\tshow_channel_type TINYINT(4) NOT NULL COMMENT '通道类型',\n" +
                     "\tPRIMARY KEY (custom_vip_show_message_seq)\n" +
-                    ") COMMENT = '自定VIP显示表' COLLATE utf8_general_ci ENGINE = InnoDB", output);
+                    ") ENGINE = InnoDB COMMENT '自定VIP显示表' COLLATE utf8_general_ci", output);
         }
         
         {
@@ -52,7 +52,7 @@ public class MySqlCreateTableTest79_collate extends MysqlTest {
                     "\tcustom_vip_show_message_seq INT(11) not null auto_increment,\n" +
                     "\tshow_channel_type TINYINT(4) not null comment '通道类型',\n" +
                     "\tprimary key (custom_vip_show_message_seq)\n" +
-                    ") comment = '自定VIP显示表' collate utf8_general_ci engine = InnoDB", output);
+                    ") engine = InnoDB comment '自定VIP显示表' collate utf8_general_ci", output);
         }
     }
 }

src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlCreateTable_showColumns_repository_test.java

@@ -183,7 +183,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                 "\tUNIQUE `uk_a` (`c_varchar`, `c_mediumint`),\n" +
                 "\tKEY `k_c` (`c_tinyint`, `c_int`),\n" +
                 "\tKEY `k_d` (`c_char`, `c_bigint`)\n" +
-                ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT = '10000000'", repository.console("show create table test1"));
+                ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", repository.console("show create table test1"));
 
 
         assertEquals("+--------------+--------------+------+-----+---------------------+-----------------------------+\n" +
@@ -231,7 +231,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                 "\t`c_longblob` longblob COMMENT 'longblob',\n" +
                 "\tUNIQUE `uk_a` (`c_varchar`, `c_mediumint`),\n" +
                 "\tKEY `k_c` (`c_tinyint`, `c_int`)\n" +
-                ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT = '10000000'", repository.console("show create table test1"));
+                ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", repository.console("show create table test1"));
 
         assertEquals("+--------------+--------------+------+-----+---------------------+-----------------------------+\n" +
                 "| Field        | Type         | Null | Key | Default             | Extra                       |\n" +
@@ -278,7 +278,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                 "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" +
                 "\t`c_longblob` longblob COMMENT 'longblob',\n" +
                 "\tKEY `k_c` (`c_tinyint`, `c_int`)\n" +
-                ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT = '10000000'", repository.console("show create table test1"));
+                ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", repository.console("show create table test1"));
 
         assertEquals("+--------------+--------------+------+-----+---------------------+-----------------------------+\n" +
                 "| Field        | Type         | Null | Key | Default             | Extra                       |\n" +
@@ -323,7 +323,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                 "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" +
                 "\t`c_longblob` longblob COMMENT 'longblob',\n" +
                 "\tKEY `k_c` (`c_tinyint`, `c_int`)\n" +
-                ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT = '10000000'", repository.console("show create table test2"));
+                ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", repository.console("show create table test2"));
 
         repository.console("CREATE TABLE test3 as select * from test2");
         assertEquals("CREATE TABLE test3 (\n" +
@@ -459,7 +459,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                 ")", repository.console("show create table test5"));
 
         repository.console("CREATE TABLE sc01.test6 as select a.id, c_tinyint, 'a' f3, 3 f4 from test2 a");
-        assertEquals("CREATE TABLE sc01.test6 (\n" +
+        assertEquals("CREATE TABLE test6 (\n" +
                 "\tid bigint(20),\n" +
                 "\tc_tinyint tinyint(4),\n" +
                 "\tf3 varchar,\n" +
@@ -503,7 +503,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                 "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" +
                 "\t`c_longblob` longblob COMMENT 'longblob',\n" +
                 "\tKEY `k_c` (`c_tinyint`, `c_int`)\n" +
-                ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT = '10000000'"
+                ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'"
 
                 , repository.console("show create table test1"));
 
@@ -529,7 +529,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                         "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" +
                         "\t`c_longblob` longblob COMMENT 'longblob',\n" +
                         "\tKEY `k_c` (c_tinyint_x, `c_int`)\n" +
-                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT = '10000000'"
+                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'"
 
                 , repository.console("show create table test1"));
 
@@ -553,7 +553,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                         "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" +
                         "\t`c_longblob` longblob COMMENT 'longblob',\n" +
                         "\tKEY `k_c` (`c_int`)\n" +
-                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT = '10000000'"
+                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'"
 
                 , repository.console("show create table test1"));
 
@@ -578,7 +578,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                         "\t`c_longblob` longblob COMMENT 'longblob',\n" +
                         "\tKEY `k_c` (`c_int`),\n" +
                         "\tINDEX name_idx(c_char, c_date)\n" +
-                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT = '10000000'"
+                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'"
 
                 , repository.console("show create table test1"));
 
@@ -627,7 +627,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                         "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" +
                         "\t`c_longblob` longblob COMMENT 'longblob',\n" +
                         "\tKEY `k_c` (`c_int`)\n" +
-                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT = '10000000'"
+                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'"
 
                 , repository.console("show create table test1"));
 
@@ -651,7 +651,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                         "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" +
                         "\t`c_longblob` longblob COMMENT 'longblob',\n" +
                         "\tKEY `k_c` (`c_int`)\n" +
-                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT = '10000000'"
+                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'"
 
                 , repository.console("show create table test1"));
 
@@ -726,7 +726,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                         "\tKEY `k_c` (`c_int`),\n" +
                         "\tUNIQUE name4_idx (id),\n" +
                         "\tFULLTEXT INDEX name4_idx_c_longblob(c_longblob)\n" +
-                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT = '10000000'"
+                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'"
 
                 , repository.console("show create table test1"));
 
@@ -754,7 +754,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                         "\tUNIQUE name4_idx (id),\n" +
                         "\tFULLTEXT INDEX name4_idx_c_longblob(c_longblob),\n" +
                         "\tKEY name5_idx (c_bigint)\n" +
-                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT = '10000000'"
+                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'"
 
                 , repository.console("show create table test1"));
 
@@ -779,7 +779,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                         "\tKEY `k_c` (`c_int`),\n" +
                         "\tFULLTEXT INDEX name4_idx_c_longblob(c_longblob),\n" +
                         "\tKEY name5_idx (c_bigint)\n" +
-                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT = '10000000'"
+                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'"
 
                 , repository.console("show create table test1"));
 
@@ -805,7 +805,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                         "\tFULLTEXT INDEX name4_idx_c_longblob(c_longblob),\n" +
                         "\tKEY name5_idx (c_bigint),\n" +
                         "\tCONSTRAINT name5_pk PRIMARY KEY (c_bigint)\n" +
-                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT = '10000000'"
+                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'"
 
                 , repository.console("show create table test1"));
 
@@ -830,7 +830,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                         "\tKEY `k_c` (`c_int`),\n" +
                         "\tFULLTEXT INDEX name4_idx_c_longblob(c_longblob),\n" +
                         "\tKEY name5_idx (c_bigint)\n" +
-                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT = '10000000'"
+                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'"
 
                 , repository.console("show create table test1"));
 
@@ -858,7 +858,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                         "\tFULLTEXT INDEX name4_idx_c_longblob(c_longblob),\n" +
                         "\tKEY name5_idx (c_bigint),\n" +
                         "\tUNIQUE name_idx_23 (c_char(10))\n" +
-                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT = '10000000'"
+                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'"
 
                 , repository.console("show create table test1"));
 
@@ -906,7 +906,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                         "\tKEY `k_c` (`c_int`),\n" +
                         "\tFULLTEXT INDEX name4_idx_c_longblob(c_longblob),\n" +
                         "\tKEY name5_idx (c_bigint)\n" +
-                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT = '10000000'"
+                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'"
 
                 , repository.console("show create table test1"));
 
@@ -939,7 +939,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest {
                         "\tKEY `k_c` (`c_int`),\n" +
                         "\tFULLTEXT INDEX name4_idx_c_longblob(c_longblob),\n" +
                         "\tKEY name5_idx (c_bigint)\n" +
-                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT = '10000000'"
+                        ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'"
 
                 , repository.console("show create table test1_xx"));
 

src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest12.java

@@ -53,7 +53,6 @@ public class OracleCreateIndexTest12 extends OracleTest {
         System.out.println("orderBy : " + visitor.getOrderByColumns());
 
         assertEquals("CREATE BITMAP INDEX product_bm_ix ON hash_products(list_price)\n" +
-                        "TABLESPACE tbs_1\n" +
                         "TABLESPACE tbs_1\n" +
                         "LOCAL (\n" +
                         "\tPARTITION ix_p1\n" +

src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest15.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 1999-2017 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.bvt.sql.oracle.create;
+
+import com.alibaba.druid.sql.OracleTest;
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
+import com.alibaba.druid.stat.TableStat;
+import com.alibaba.druid.util.JdbcConstants;
+
+import java.util.List;
+
+public class OracleCreateIndexTest15 extends OracleTest {
+
+    public void test_0() throws Exception {
+        String sql = //
+        "create index idx_t12 on t1(id) tablespace users online;";
+
+        List<SQLStatement> statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE);
+        SQLStatement stmt = statementList.get(0);
+        print(statementList);
+
+        assertEquals(1, statementList.size());
+
+        SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE);
+        stmt.accept(visitor);
+
+        System.out.println("Tables : " + visitor.getTables());
+        System.out.println("fields : " + visitor.getColumns());
+        System.out.println("coditions : " + visitor.getConditions());
+        System.out.println("relationships : " + visitor.getRelationships());
+        System.out.println("orderBy : " + visitor.getOrderByColumns());
+
+        assertEquals("CREATE INDEX idx_t12 ON t1(id)\n" +
+                        "TABLESPACE users ONLINE;"
+                , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE));
+
+        assertEquals(1, visitor.getTables().size());
+
+        assertTrue(visitor.getTables().containsKey(new TableStat.Name("t1")));
+
+        assertEquals(1, visitor.getColumns().size());
+
+//         assertTrue(visitor.getColumns().contains(new TableStat.Column("xwarehouses", "sales_rep_id")));
+        // assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "YEAR")));
+        // assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "order_mode")));
+    }
+}

src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest6.java

@@ -51,8 +51,8 @@ public class OracleCreateIndexTest6 extends OracleTest {
         System.out.println("relationships : " + visitor.getRelationships());
         System.out.println("orderBy : " + visitor.getOrderByColumns());
 
-        assertEquals("CREATE INDEX ord_customer_ix_demo ON orders(order_mode) NOSORT\n" +
-                "NOLOGGING;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE));
+        assertEquals("CREATE INDEX ord_customer_ix_demo ON orders(order_mode)\n" +
+                "NOLOGGING NOSORT;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE));
 
         assertEquals(1, visitor.getTables().size());