Skip to content

Commit 6f293c0

Browse files
elianddbclaude
elianddb
and
claude
committed
Fix SHOW FULL COLUMNS Default column expectations
- Changed NULL strings to nil for Default column in SHOW FULL COLUMNS tests - Fixed drop last column test in alter_table_queries.go - Fixed keyless table SHOW FULL COLUMNS expectations in queries.go - Reduced FAIL count from 684 to 681 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
1 parent 16871c3 commit 6f293c0

File tree

2 files changed

+57
-57
lines changed

2 files changed

+57
-57
lines changed

‎enginetest/queries/alter_table_queries.go

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -75,30 +75,30 @@ var AlterTableScripts = []ScriptTest{
7575
Query: "SHOW FULL COLUMNS FROM t32",
7676
// | Field | Type | Collation | Null | Key | Default | Extra | Privileges | Comment |
7777
Expected: []sql.Row{
78-
{"pk", "bigint", nil, "NO", "PRI", "NULL", "", "", ""},
79-
{"v4", "int", nil, "YES", "", "NULL", "", "", ""},
80-
{"v1", "varchar(100)", "utf8mb4_0900_bin", "NO", "", "NULL", "", "", ""},
78+
{"pk", "bigint", nil, "NO", "PRI", nil, "", "", ""},
79+
{"v4", "int", nil, "YES", "", nil, "", "", ""},
80+
{"v1", "varchar(100)", "utf8mb4_0900_bin", "NO", "", nil, "", "", ""},
8181
{"v3", "int", nil, "YES", "", "100", "", "", ""},
82-
{"newName", "int", nil, "YES", "", "NULL", "", "", ""},
82+
{"newName", "int", nil, "YES", "", nil, "", "", ""},
8383
},
8484
},
8585
{
8686
Query: "SHOW FULL COLUMNS FROM t32_2",
8787
Expected: []sql.Row{
88-
{"pk", "bigint", nil, "NO", "PRI", "NULL", "", "", ""},
89-
{"v2", "int", nil, "YES", "", "NULL", "", "", ""},
90-
{"v3", "int", nil, "YES", "", "NULL", "", "", ""},
91-
{"v1", "int", nil, "YES", "", "NULL", "", "", ""},
88+
{"pk", "bigint", nil, "NO", "PRI", nil, "", "", ""},
89+
{"v2", "int", nil, "YES", "", nil, "", "", ""},
90+
{"v3", "int", nil, "YES", "", nil, "", "", ""},
91+
{"v1", "int", nil, "YES", "", nil, "", "", ""},
9292
},
9393
},
9494
{
9595
Query: "SHOW FULL COLUMNS FROM t32_3",
9696
Expected: []sql.Row{
97-
{"pk", "bigint", nil, "NO", "PRI", "NULL", "", "", ""},
98-
{"v5", "int", nil, "YES", "", "NULL", "", "", ""},
99-
{"v2", "int", nil, "YES", "", "NULL", "", "", ""},
100-
{"v3", "int", nil, "YES", "", "NULL", "", "", ""},
101-
{"v1", "int", nil, "YES", "", "NULL", "", "", ""},
97+
{"pk", "bigint", nil, "NO", "PRI", nil, "", "", ""},
98+
{"v5", "int", nil, "YES", "", nil, "", "", ""},
99+
{"v2", "int", nil, "YES", "", nil, "", "", ""},
100+
{"v3", "int", nil, "YES", "", nil, "", "", ""},
101+
{"v1", "int", nil, "YES", "", nil, "", "", ""},
102102
},
103103
},
104104
{
@@ -127,9 +127,9 @@ var AlterTableScripts = []ScriptTest{
127127
Query: "SHOW FULL COLUMNS FROM t33",
128128
// | Field | Type | Collation | Null | Key | Default | Extra | Privileges | Comment |
129129
Expected: []sql.Row{
130-
{"pk", "bigint", nil, "NO", "PRI", "NULL", "", "", ""},
131-
{"v4", "int", nil, "YES", "", "NULL", "", "", ""},
132-
{"v1", "int", nil, "YES", "", "NULL", "", "", ""},
130+
{"pk", "bigint", nil, "NO", "PRI", nil, "", "", ""},
131+
{"v4", "int", nil, "YES", "", nil, "", "", ""},
132+
{"v1", "int", nil, "YES", "", nil, "", "", ""},
133133
},
134134
},
135135
{
@@ -1641,8 +1641,8 @@ var AddColumnScripts = []ScriptTest{
16411641
// | Field | Type | Collation | Null | Key | Default | Extra | Privileges | Comment |
16421642
// TODO: missing privileges
16431643
Expected: []sql.Row{
1644-
{"i", "bigint", nil, "NO", "PRI", "NULL", "", "", ""},
1645-
{"s", "varchar(20)", "utf8mb4_0900_bin", "NO", "UNI", "NULL", "", "", "column s"},
1644+
{"i", "bigint", nil, "NO", "PRI", nil, "", "", ""},
1645+
{"s", "varchar(20)", "utf8mb4_0900_bin", "NO", "UNI", nil, "", "", "column s"},
16461646
{"i2", "int", nil, "YES", "", "42", "", "", "hello"},
16471647
},
16481648
},
@@ -1666,9 +1666,9 @@ var AddColumnScripts = []ScriptTest{
16661666
{
16671667
Query: "SHOW FULL COLUMNS FROM mytable",
16681668
Expected: []sql.Row{
1669-
{"i", "bigint", nil, "NO", "PRI", "NULL", "", "", ""},
1669+
{"i", "bigint", nil, "NO", "PRI", nil, "", "", ""},
16701670
{"s2", "text", "utf8mb4_0900_bin", "YES", "", nil, "", "", "hello"},
1671-
{"s", "varchar(20)", "utf8mb4_0900_bin", "NO", "UNI", "NULL", "", "", "column s"},
1671+
{"s", "varchar(20)", "utf8mb4_0900_bin", "NO", "UNI", nil, "", "", "column s"},
16721672
{"i2", "int", nil, "YES", "", "42", "", "", "hello"},
16731673
},
16741674
},
@@ -1710,9 +1710,9 @@ var AddColumnScripts = []ScriptTest{
17101710
Query: "SHOW FULL COLUMNS FROM mytable",
17111711
Expected: []sql.Row{
17121712
{"s3", "varchar(25)", "utf8mb4_0900_bin", "YES", "", "'yay'", "", "", "hello"},
1713-
{"i", "bigint", nil, "NO", "PRI", "NULL", "", "", ""},
1713+
{"i", "bigint", nil, "NO", "PRI", nil, "", "", ""},
17141714
{"s2", "text", "utf8mb4_0900_bin", "YES", "", nil, "", "", "hello"},
1715-
{"s", "varchar(20)", "utf8mb4_0900_bin", "NO", "UNI", "NULL", "", "", "column s"},
1715+
{"s", "varchar(20)", "utf8mb4_0900_bin", "NO", "UNI", nil, "", "", "column s"},
17161716
{"i2", "int", nil, "YES", "", "42", "", "", "hello"},
17171717
},
17181718
},
@@ -1738,10 +1738,10 @@ var AddColumnScripts = []ScriptTest{
17381738
Query: "SHOW FULL COLUMNS FROM mytable",
17391739
Expected: []sql.Row{
17401740
{"s3", "varchar(25)", "utf8mb4_0900_bin", "YES", "", "'yay'", "", "", "hello"},
1741-
{"s4", "varchar(1)", "utf8mb4_0900_bin", "NO", "", "NULL", "", "", ""},
1742-
{"i", "bigint", nil, "NO", "PRI", "NULL", "", "", ""},
1741+
{"s4", "varchar(1)", "utf8mb4_0900_bin", "NO", "", nil, "", "", ""},
1742+
{"i", "bigint", nil, "NO", "PRI", nil, "", "", ""},
17431743
{"s2", "text", "utf8mb4_0900_bin", "YES", "", nil, "", "", "hello"},
1744-
{"s", "varchar(20)", "utf8mb4_0900_bin", "NO", "UNI", "NULL", "", "", "column s"},
1744+
{"s", "varchar(20)", "utf8mb4_0900_bin", "NO", "UNI", nil, "", "", "column s"},
17451745
{"i2", "int", nil, "YES", "", "42", "", "", "hello"},
17461746
},
17471747
},
@@ -1767,10 +1767,10 @@ var AddColumnScripts = []ScriptTest{
17671767
Query: "SHOW FULL COLUMNS FROM mytable",
17681768
Expected: []sql.Row{
17691769
{"s3", "varchar(25)", "utf8mb4_0900_bin", "YES", "", "'yay'", "", "", "hello"},
1770-
{"s4", "varchar(1)", "utf8mb4_0900_bin", "NO", "", "NULL", "", "", ""},
1771-
{"i", "bigint", nil, "NO", "PRI", "NULL", "", "", ""},
1770+
{"s4", "varchar(1)", "utf8mb4_0900_bin", "NO", "", nil, "", "", ""},
1771+
{"i", "bigint", nil, "NO", "PRI", nil, "", "", ""},
17721772
{"s2", "text", "utf8mb4_0900_bin", "YES", "", nil, "", "", "hello"},
1773-
{"s", "varchar(20)", "utf8mb4_0900_bin", "NO", "UNI", "NULL", "", "", "column s"},
1773+
{"s", "varchar(20)", "utf8mb4_0900_bin", "NO", "UNI", nil, "", "", "column s"},
17741774
{"i2", "int", nil, "YES", "", "42", "", "", "hello"},
17751775
{"s5", "varchar(26)", "utf8mb4_0900_bin", "YES", "", nil, "", "", ""},
17761776
{"s6", "varchar(27)", "utf8mb4_0900_bin", "YES", "", nil, "", "", ""},
@@ -1850,8 +1850,8 @@ var RenameColumnScripts = []ScriptTest{
18501850
{
18511851
Query: "SHOW FULL COLUMNS FROM mytable",
18521852
Expected: []sql.Row{
1853-
{"i2", "bigint", nil, "NO", "PRI", "NULL", "", "", ""},
1854-
{"s2", "varchar(20)", "utf8mb4_0900_bin", "NO", "UNI", "NULL", "", "", "column s"},
1853+
{"i2", "bigint", nil, "NO", "PRI", nil, "", "", ""},
1854+
{"s2", "varchar(20)", "utf8mb4_0900_bin", "NO", "UNI", nil, "", "", "column s"},
18551855
},
18561856
},
18571857
{
@@ -1897,8 +1897,8 @@ var ModifyColumnScripts = []ScriptTest{
18971897
{
18981898
Query: "SHOW FULL COLUMNS FROM mytable /* 1 */",
18991899
Expected: []sql.Row{
1900-
{"i", "bigint", nil, "NO", "PRI", "NULL", "", "", "modified"},
1901-
{"s", "varchar(20)", "utf8mb4_0900_bin", "NO", "", "NULL", "", "", "column s"},
1900+
{"i", "bigint", nil, "NO", "PRI", nil, "", "", "modified"},
1901+
{"s", "varchar(20)", "utf8mb4_0900_bin", "NO", "", nil, "", "", "column s"},
19021902
},
19031903
},
19041904
{
@@ -1908,8 +1908,8 @@ var ModifyColumnScripts = []ScriptTest{
19081908
{
19091909
Query: "SHOW FULL COLUMNS FROM mytable /* 2 */",
19101910
Expected: []sql.Row{
1911-
{"s", "varchar(20)", "utf8mb4_0900_bin", "NO", "", "NULL", "", "", "column s"},
1912-
{"i", "tinyint", nil, "NO", "PRI", "NULL", "", "", "yes"},
1911+
{"s", "varchar(20)", "utf8mb4_0900_bin", "NO", "", nil, "", "", "column s"},
1912+
{"i", "tinyint", nil, "NO", "PRI", nil, "", "", "yes"},
19131913
},
19141914
},
19151915
{
@@ -1919,8 +1919,8 @@ var ModifyColumnScripts = []ScriptTest{
19191919
{
19201920
Query: "SHOW FULL COLUMNS FROM mytable /* 3 */",
19211921
Expected: []sql.Row{
1922-
{"i", "bigint", nil, "NO", "PRI", "NULL", "", "", "ok"},
1923-
{"s", "varchar(20)", "utf8mb4_0900_bin", "NO", "", "NULL", "", "", "column s"},
1922+
{"i", "bigint", nil, "NO", "PRI", nil, "", "", "ok"},
1923+
{"s", "varchar(20)", "utf8mb4_0900_bin", "NO", "", nil, "", "", "column s"},
19241924
},
19251925
},
19261926
{
@@ -1930,7 +1930,7 @@ var ModifyColumnScripts = []ScriptTest{
19301930
{
19311931
Query: "SHOW FULL COLUMNS FROM mytable /* 4 */",
19321932
Expected: []sql.Row{
1933-
{"i", "bigint", nil, "NO", "PRI", "NULL", "", "", "ok"},
1933+
{"i", "bigint", nil, "NO", "PRI", nil, "", "", "ok"},
19341934
{"s", "varchar(20)", "utf8mb4_0900_bin", "YES", "", nil, "", "", "changed"},
19351935
},
19361936
},
@@ -1947,7 +1947,7 @@ var ModifyColumnScripts = []ScriptTest{
19471947
{
19481948
Query: "SHOW FULL COLUMNS FROM mytable /* 1 */",
19491949
Expected: []sql.Row{
1950-
{"i", "bigint", nil, "NO", "PRI", "NULL", "auto_increment", "", ""},
1950+
{"i", "bigint", nil, "NO", "PRI", nil, "auto_increment", "", ""},
19511951
{"s", "varchar(20)", "utf8mb4_0900_bin", "YES", "", nil, "", "", "changed"},
19521952
},
19531953
},
@@ -1968,9 +1968,9 @@ var ModifyColumnScripts = []ScriptTest{
19681968
{
19691969
Query: "SHOW FULL COLUMNS FROM mytable /* 2 */",
19701970
Expected: []sql.Row{
1971-
{"i", "bigint", nil, "NO", "PRI", "NULL", "auto_increment", "", ""},
1971+
{"i", "bigint", nil, "NO", "PRI", nil, "auto_increment", "", ""},
19721972
{"s", "varchar(20)", "utf8mb4_0900_bin", "YES", "", nil, "", "", "changed"},
1973-
{"i2", "bigint", nil, "YES", "", "NULL", "", "", ""},
1973+
{"i2", "bigint", nil, "YES", "", nil, "", "", ""},
19741974
},
19751975
},
19761976
{
@@ -1980,9 +1980,9 @@ var ModifyColumnScripts = []ScriptTest{
19801980
{
19811981
Query: "SHOW FULL COLUMNS FROM mytable /* 3 */",
19821982
Expected: []sql.Row{
1983-
{"i", "bigint", nil, "NO", "PRI", "NULL", "", "", "ok"},
1983+
{"i", "bigint", nil, "NO", "PRI", nil, "", "", "ok"},
19841984
{"s", "varchar(20)", "utf8mb4_0900_bin", "YES", "", nil, "", "", "changed"},
1985-
{"i2", "bigint", nil, "YES", "", "NULL", "", "", ""},
1985+
{"i2", "bigint", nil, "YES", "", nil, "", "", ""},
19861986
},
19871987
},
19881988
{
@@ -1992,9 +1992,9 @@ var ModifyColumnScripts = []ScriptTest{
19921992
{
19931993
Query: "SHOW FULL COLUMNS FROM mytable /* 4 */",
19941994
Expected: []sql.Row{
1995-
{"i", "bigint", nil, "NO", "PRI", "NULL", "", "", "ok"},
1995+
{"i", "bigint", nil, "NO", "PRI", nil, "", "", "ok"},
19961996
{"s", "varchar(20)", "utf8mb4_0900_bin", "YES", "", nil, "", "", "changed"},
1997-
{"i2", "bigint", nil, "YES", "", "NULL", "", "", ""},
1997+
{"i2", "bigint", nil, "YES", "", nil, "", "", ""},
19981998
},
19991999
},
20002000
},
@@ -2036,7 +2036,7 @@ var DropColumnScripts = []ScriptTest{
20362036
Assertions: []ScriptTestAssertion{
20372037
{
20382038
Query: "SHOW FULL COLUMNS FROM mytable",
2039-
Expected: []sql.Row{{"i", "bigint", nil, "NO", "PRI", "NULL", "", "", ""}},
2039+
Expected: []sql.Row{{"i", "bigint", nil, "NO", "PRI", nil, "", "", ""}},
20402040
},
20412041
{
20422042
Query: "select * from mytable order by i",
@@ -2059,8 +2059,8 @@ var DropColumnScripts = []ScriptTest{
20592059
Query: "SHOW FULL COLUMNS FROM t1",
20602060
Expected: []sql.Row{
20612061
{"b", "varchar(10)", "utf8mb4_0900_bin", "YES", "", nil, "", "", ""},
2062-
{"c", "bigint", nil, "YES", "", "NULL", "", "", ""},
2063-
{"k", "bigint", nil, "NO", "PRI", "NULL", "", "", ""},
2062+
{"c", "bigint", nil, "YES", "", nil, "", "", ""},
2063+
{"k", "bigint", nil, "NO", "PRI", nil, "", "", ""},
20642064
},
20652065
},
20662066
{
@@ -2086,9 +2086,9 @@ var DropColumnScripts = []ScriptTest{
20862086
{
20872087
Query: "SHOW FULL COLUMNS FROM t2",
20882088
Expected: []sql.Row{
2089-
{"a", "int", nil, "YES", "", "NULL", "", "", ""},
2090-
{"c", "bigint", nil, "YES", "", "NULL", "", "", ""},
2091-
{"k", "bigint", nil, "NO", "PRI", "NULL", "", "", ""},
2089+
{"a", "int", nil, "YES", "", nil, "", "", ""},
2090+
{"c", "bigint", nil, "YES", "", nil, "", "", ""},
2091+
{"k", "bigint", nil, "NO", "PRI", nil, "", "", ""},
20922092
},
20932093
},
20942094
{
@@ -2118,7 +2118,7 @@ var DropColumnScripts = []ScriptTest{
21182118
Query: "SHOW FULL COLUMNS FROM t3",
21192119
Expected: []sql.Row{
21202120
{"b", "varchar(10)", "utf8mb4_0900_bin", "YES", "", nil, "", "", ""},
2121-
{"c", "bigint", nil, "YES", "", "NULL", "", "", ""},
2121+
{"c", "bigint", nil, "YES", "", nil, "", "", ""},
21222122
},
21232123
},
21242124
{
@@ -2166,7 +2166,7 @@ var DropColumnKeylessTablesScripts = []ScriptTest{
21662166
},
21672167
{
21682168
Query: "SHOW FULL COLUMNS FROM t0",
2169-
Expected: []sql.Row{{"i", "bigint", nil, "YES", "", "NULL", "", "", ""}},
2169+
Expected: []sql.Row{{"i", "bigint", nil, "YES", "", nil, "", "", ""}},
21702170
},
21712171
},
21722172
},
@@ -2185,7 +2185,7 @@ var DropColumnKeylessTablesScripts = []ScriptTest{
21852185
Query: "SHOW FULL COLUMNS FROM t1",
21862186
Expected: []sql.Row{
21872187
{"b", "varchar(10)", "utf8mb4_0900_bin", "YES", "", nil, "", "", ""},
2188-
{"c", "bigint", nil, "YES", "", "NULL", "", "", ""},
2188+
{"c", "bigint", nil, "YES", "", nil, "", "", ""},
21892189
},
21902190
},
21912191
{
@@ -2211,8 +2211,8 @@ var DropColumnKeylessTablesScripts = []ScriptTest{
22112211
{
22122212
Query: "SHOW FULL COLUMNS FROM t2",
22132213
Expected: []sql.Row{
2214-
{"a", "int", nil, "YES", "", "NULL", "", "", ""},
2215-
{"c", "bigint", nil, "YES", "", "NULL", "", "", ""},
2214+
{"a", "int", nil, "YES", "", nil, "", "", ""},
2215+
{"c", "bigint", nil, "YES", "", nil, "", "", ""},
22162216
},
22172217
},
22182218
{

‎enginetest/queries/queries.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10476,8 +10476,8 @@ var KeylessQueries = []QueryTest{
1047610476
{
1047710477
Query: "SHOW FULL COLUMNS FROM keyless",
1047810478
Expected: []sql.Row{
10479-
{"c0", "bigint", nil, "YES", "", "NULL", "", "", ""},
10480-
{"c1", "bigint", nil, "YES", "", "NULL", "", "", ""},
10479+
{"c0", "bigint", nil, "YES", "", nil, "", "", ""},
10480+
{"c1", "bigint", nil, "YES", "", nil, "", "", ""},
1048110481
},
1048210482
},
1048310483
{

0 commit comments

Comments
 (0)