From 03ce72f9abc7cab92c6fbab8f488bbdb3911e3bc Mon Sep 17 00:00:00 2001 From: "shaojin.wensj" Date: Fri, 10 Feb 2023 10:25:03 +0800 Subject: [PATCH] fix testcase --- ...eateTable_showColumns_repository_test.java | 633 +++++++++--------- .../createTable/MySqlCreateTableTest84.java | 44 +- 2 files changed, 338 insertions(+), 339 deletions(-) diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_repository_test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_repository_test.java index 8e87547c01..56c5eb37ac 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_repository_test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_repository_test.java @@ -160,28 +160,30 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { repository.console("ALTER TABLE test1 DROP PRIMARY KEY;"); assertEquals(20, createTableStmt.getTableElementList().size()); - assertEquals("CREATE TABLE `test1` (\n" + - "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + - "\t`c_tinyint` tinyint(4) DEFAULT '1' COMMENT 'tinyint',\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_char` char(10) DEFAULT NULL COMMENT 'char',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tUNIQUE KEY `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")); + assertEquals("CREATE TABLE test1 (\n" + + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + + "\tid bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tc_tinyint tinyint(4) DEFAULT '1' COMMENT 'tinyint',\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_char char(10) DEFAULT NULL COMMENT 'char',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_longblob longblob COMMENT 'longblob',\n" + + "\tUNIQUE KEY 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") + ); assertEquals("+--------------+--------------+------+-----+---------------------+-----------------------------+\n" + @@ -209,27 +211,29 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { repository.console("ALTER TABLE test1 DROP INDEX k_d;"); assertEquals(19, createTableStmt.getTableElementList().size()); - assertEquals("CREATE TABLE `test1` (\n" + - "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + - "\t`c_tinyint` tinyint(4) DEFAULT '1' COMMENT 'tinyint',\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_char` char(10) DEFAULT NULL COMMENT 'char',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tUNIQUE KEY `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")); + assertEquals("CREATE TABLE test1 (\n" + + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + + "\tid bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tc_tinyint tinyint(4) DEFAULT '1' COMMENT 'tinyint',\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_char char(10) DEFAULT NULL COMMENT 'char',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_longblob longblob COMMENT 'longblob',\n" + + "\tUNIQUE KEY 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") + ); assertEquals("+--------------+--------------+------+-----+---------------------+-----------------------------+\n" + "| Field | Type | Null | Key | Default | Extra |\n" + @@ -257,26 +261,28 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { repository.console("ALTER TABLE test1 DROP INDEX uk_a;"); assertEquals(18, createTableStmt.getTableElementList().size()); - assertEquals("CREATE TABLE `test1` (\n" + + assertEquals("CREATE TABLE test1 (\n" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + - "\t`c_tinyint` tinyint(4) DEFAULT '1' COMMENT 'tinyint',\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_char` char(10) DEFAULT NULL COMMENT 'char',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\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")); + "\tid bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tc_tinyint tinyint(4) DEFAULT '1' COMMENT 'tinyint',\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_char char(10) DEFAULT NULL COMMENT 'char',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_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") + ); assertEquals("+--------------+--------------+------+-----+---------------------+-----------------------------+\n" + "| Field | Type | Null | Key | Default | Extra |\n" + @@ -304,23 +310,23 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { assertEquals("CREATE TABLE test2 (\n" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + - "\t`c_tinyint` tinyint(4) DEFAULT '1' COMMENT 'tinyint',\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_char` char(10) DEFAULT NULL COMMENT 'char',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tKEY `k_c` (`c_tinyint`, `c_int`)\n" + + "\tid bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tc_tinyint tinyint(4) DEFAULT '1' COMMENT 'tinyint',\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_char char(10) DEFAULT NULL COMMENT 'char',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_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")); repository.console("CREATE TABLE test3 as select * from test2"); @@ -482,102 +488,99 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { assertEquals("\n", repository.console("show tables from sc01")); - assertEquals("CREATE TABLE `test1` (\n" + + assertEquals("CREATE TABLE test1 (\n" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + - "\t`c_tinyint` tinyint(4) DEFAULT '1' COMMENT 'tinyint',\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_char` char(10) DEFAULT NULL COMMENT 'char',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tKEY `k_c` (`c_tinyint`, `c_int`)\n" + + "\tid bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tc_tinyint tinyint(4) DEFAULT '1' COMMENT 'tinyint',\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_char char(10) DEFAULT NULL COMMENT 'char',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_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")); + , repository.console("show create table test1") + ); repository.console(" alter table test1 change c_tinyint c_tinyint_x tinyint(4) DEFAULT '1' COMMENT 'tinyint x' first;"); - assertEquals("CREATE TABLE `test1` (\n" + + assertEquals("CREATE TABLE test1 (\n" + "\tc_tinyint_x tinyint(4) DEFAULT '1' COMMENT 'tinyint x',\n" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_char` char(10) DEFAULT NULL COMMENT 'char',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tKEY `k_c` (c_tinyint_x, `c_int`)\n" + + "\tid bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_char char(10) DEFAULT NULL COMMENT 'char',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_longblob longblob COMMENT 'longblob',\n" + + "\tKEY k_c (c_tinyint_x, c_int)\n" + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" - , repository.console("show create table test1")); repository.console(" alter table test1 drop c_tinyint_x"); - assertEquals("CREATE TABLE `test1` (\n" + + assertEquals("CREATE TABLE test1 (\n" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_char` char(10) DEFAULT NULL COMMENT 'char',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tKEY `k_c` (`c_int`)\n" + + "\tid bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_char char(10) DEFAULT NULL COMMENT 'char',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_longblob longblob COMMENT 'longblob',\n" + + "\tKEY k_c (c_int)\n" + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" - , repository.console("show create table test1")); repository.console(" alter table test1 add index name_idx(c_char,c_date);"); - assertEquals("CREATE TABLE `test1` (\n" + + assertEquals("CREATE TABLE test1 (\n" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_char` char(10) DEFAULT NULL COMMENT 'char',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tKEY `k_c` (`c_int`),\n" + + "\tid bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_char char(10) DEFAULT NULL COMMENT 'char',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_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'" - , repository.console("show create table test1")); @@ -607,50 +610,48 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { repository.console(" drop index name_idx on test1"); - assertEquals("CREATE TABLE `test1` (\n" + + assertEquals("CREATE TABLE test1 (\n" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_char` char(10) DEFAULT NULL COMMENT 'char',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tKEY `k_c` (`c_int`)\n" + + "\tid bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_char char(10) DEFAULT NULL COMMENT 'char',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_longblob longblob COMMENT 'longblob',\n" + + "\tKEY k_c (c_int)\n" + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" - , repository.console("show create table test1")); repository.console("alter table test1 modify c_char char(32) after id"); - assertEquals("CREATE TABLE `test1` (\n" + + assertEquals("CREATE TABLE test1 (\n" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tid bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + "\tc_char char(32),\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tKEY `k_c` (`c_int`)\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_longblob longblob COMMENT 'longblob',\n" + + "\tKEY k_c (c_int)\n" + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" - , repository.console("show create table test1")); assertEquals("+--------------+--------------+------+-----+---------------------+-----------------------------+\n" + @@ -704,77 +705,75 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { repository.console("alter table test1 add FULLTEXT name4_idx_c_longblob(c_longblob); "); - assertEquals("CREATE TABLE `test1` (\n" + + assertEquals("CREATE TABLE test1 (\n" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tid bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + "\tc_char char(32),\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tKEY `k_c` (`c_int`),\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_longblob longblob COMMENT 'longblob',\n" + + "\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'" - , repository.console("show create table test1")); repository.console("alter table test1 add key name5_idx(c_bigint); "); - assertEquals("CREATE TABLE `test1` (\n" + + assertEquals("CREATE TABLE test1 (\n" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tid bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + "\tc_char char(32),\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tKEY `k_c` (`c_int`),\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_longblob longblob COMMENT 'longblob',\n" + + "\tKEY k_c (c_int),\n" + "\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'" - , repository.console("show create table test1")); repository.console("alter table test1 drop index name4_idx"); - assertEquals("CREATE TABLE `test1` (\n" + + assertEquals("CREATE TABLE test1 (\n" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tid bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + "\tc_char char(32),\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tKEY `k_c` (`c_int`),\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_longblob longblob COMMENT 'longblob',\n" + + "\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'" @@ -782,24 +781,24 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { , repository.console("show create table test1")); repository.console("alter table test1 add primary key name5_pk(c_bigint); "); - assertEquals("CREATE TABLE `test1` (\n" + + assertEquals("CREATE TABLE test1 (\n" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tid bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + "\tc_char char(32),\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tKEY `k_c` (`c_int`),\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_longblob longblob COMMENT 'longblob',\n" + + "\tKEY k_c (c_int),\n" + "\tFULLTEXT INDEX name4_idx_c_longblob(c_longblob),\n" + "\tKEY name5_idx (c_bigint),\n" + "\tPRIMARY KEY (c_bigint)\n" + @@ -808,24 +807,24 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { , repository.console("show create table test1")); repository.console("alter table test1 drop primary key;"); - assertEquals("CREATE TABLE `test1` (\n" + + assertEquals("CREATE TABLE test1 (\n" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tid bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + "\tc_char char(32),\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tKEY `k_c` (`c_int`),\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_longblob longblob COMMENT 'longblob',\n" + + "\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'" @@ -835,24 +834,24 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { repository.console("GRANT ALL PRIVILEGES ON *.* TO 'idbtmp_1208408_9'@'%' IDENTIFIED BY PASSWORD '*5E8A11FF574FCBC6440EB285D490AEE96B16E250' WITH GRANT OPTION"); repository.console("alter table test1 add unique key name_idx_23 (c_char(10))"); - assertEquals("CREATE TABLE `test1` (\n" + + assertEquals("CREATE TABLE test1 (\n" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tid bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + "\tc_char char(32),\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tKEY `k_c` (`c_int`),\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_longblob longblob COMMENT 'longblob',\n" + + "\tKEY k_c (c_int),\n" + "\tFULLTEXT INDEX name4_idx_c_longblob(c_longblob),\n" + "\tKEY name5_idx (c_bigint),\n" + "\tUNIQUE KEY name_idx_23 (c_char(10))\n" + @@ -885,23 +884,23 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { , repository.console("show columns from test1")); repository.console("alter table test1 drop c_char;"); - assertEquals("CREATE TABLE `test1` (\n" + + assertEquals("CREATE TABLE test1 (\n" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tKEY `k_c` (`c_int`),\n" + + "\tid bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_longblob longblob COMMENT 'longblob',\n" + + "\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'" @@ -920,21 +919,21 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { assertEquals("CREATE TABLE test1_xx (\n" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + - "\t`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tKEY `k_c` (`c_int`),\n" + + "\tid bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_longblob longblob COMMENT 'longblob',\n" + + "\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'" diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest84.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest84.java index d2cfdaa296..a0c25314fe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest84.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest84.java @@ -117,28 +117,28 @@ public class MySqlCreateTableTest84 extends MysqlTest { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); repository.console(sql); - assertEquals("CREATE TABLE `test` (\n" + - "\t`id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + - "\t`c_tinyint` tinyint(4) DEFAULT '1' COMMENT 'tinyint',\n" + - "\t`c_smallint` smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + - "\t`c_mediumint` mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + - "\t`c_int` int(11) DEFAULT NULL COMMENT 'int',\n" + - "\t`c_bigint` bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + - "\t`c_decimal` decimal(10, 3) DEFAULT NULL COMMENT 'decimal',\n" + - "\t`c_date` date DEFAULT '0000-00-00' COMMENT 'date',\n" + - "\t`c_datetime` datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + - "\t`c_timestamp` timestamp NULL DEFAULT NULL COMMENT 'timestamp',\n" + - "\t`c_time` time DEFAULT NULL COMMENT 'time',\n" + - "\t`c_char` char(10) DEFAULT NULL COMMENT 'char',\n" + - "\t`c_varchar` varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + - "\t`c_blob` blob COMMENT 'blob',\n" + - "\t`c_text` text COMMENT 'text',\n" + - "\t`c_mediumtext` mediumtext COMMENT 'mediumtext',\n" + - "\t`c_longblob` longblob COMMENT 'longblob',\n" + - "\tPRIMARY KEY (`id`),\n" + - "\tUNIQUE KEY `uk_a` (`c_tinyint`),\n" + - "\tKEY `k_b` (`c_smallint`),\n" + - "\tKEY `k_c` (`c_mediumint`, `c_int`)\n" + + assertEquals("CREATE TABLE test (\n" + + "\tid bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'id',\n" + + "\tc_tinyint tinyint(4) DEFAULT '1' COMMENT 'tinyint',\n" + + "\tc_smallint smallint(6) DEFAULT 0 COMMENT 'smallint',\n" + + "\tc_mediumint mediumint(9) DEFAULT NULL COMMENT 'mediumint',\n" + + "\tc_int int(11) DEFAULT NULL COMMENT 'int',\n" + + "\tc_bigint bigint(20) DEFAULT NULL COMMENT 'bigint',\n" + + "\tc_decimal decimal(10, 3) DEFAULT NULL COMMENT 'decimal',\n" + + "\tc_date date DEFAULT '0000-00-00' COMMENT 'date',\n" + + "\tc_datetime datetime DEFAULT '0000-00-00 00:00:00' COMMENT 'datetime',\n" + + "\tc_timestamp timestamp NULL DEFAULT NULL COMMENT 'timestamp',\n" + + "\tc_time time DEFAULT NULL COMMENT 'time',\n" + + "\tc_char char(10) DEFAULT NULL COMMENT 'char',\n" + + "\tc_varchar varchar(10) DEFAULT 'hello' COMMENT 'varchar',\n" + + "\tc_blob blob COMMENT 'blob',\n" + + "\tc_text text COMMENT 'text',\n" + + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + + "\tc_longblob longblob COMMENT 'longblob',\n" + + "\tPRIMARY KEY (id),\n" + + "\tUNIQUE KEY uk_a (c_tinyint),\n" + + "\tKEY k_b (c_smallint),\n" + + "\tKEY k_c (c_mediumint, c_int)\n" + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" , repository.console("show create table test")); }