Skip to content

Commit 4572911

Browse files
elianddbelianddb
committed
amend existing memoryengine tests
1 parent c5e4529 commit 4572911

File tree

7 files changed

+30
-30
lines changed

7 files changed

+30
-30
lines changed

‎enginetest/enginetests.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3145,7 +3145,7 @@ func TestModifyColumn(t *testing.T, harness Harness) {
31453145
se.NewConnection(ctx)
31463146
}
31473147
TestQueryWithContext(t, ctx, e, harness, "select database()", []sql.Row{{nil}}, nil, nil, nil)
3148-
TestQueryWithContext(t, ctx, e, harness, "ALTER TABLE mydb.mytable MODIFY COLUMN s VARCHAR(21) NULL COMMENT 'changed again'", []sql.Row{{types.NewOkResult(0)}}, nil, nil, nil)
3148+
TestQueryWithContext(t, ctx, e, harness, "ALTER TABLE mydb.mytable MODIFY COLUMN s VARCHAR(21) NULL COMMENT 'changed again'", []sql.Row{{types.NewOkResult(4)}}, nil, nil, nil)
31493149
TestQueryWithContext(t, ctx, e, harness, "SHOW FULL COLUMNS FROM mydb.mytable", []sql.Row{
31503150
{"i", "bigint", nil, "NO", "PRI", nil, "", "", "ok"},
31513151
{"s", "varchar(21)", "utf8mb4_0900_bin", "YES", "", nil, "", "", "changed again"},

‎enginetest/queries/alter_table_queries.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ var AlterTableScripts = []ScriptTest{
456456
Assertions: []ScriptTestAssertion{
457457
{
458458
Query: "ALTER TABLE t40 MODIFY COLUMN pk int",
459-
Expected: []sql.Row{{types.NewOkResult(0)}},
459+
Expected: []sql.Row{{types.NewOkResult(3)}},
460460
},
461461
{
462462
Query: "describe t40",
@@ -1091,7 +1091,7 @@ var AlterTableScripts = []ScriptTest{
10911091
Assertions: []ScriptTestAssertion{
10921092
{
10931093
Query: `alter table t modify column c1 int unsigned`,
1094-
Expected: []sql.Row{{types.NewOkResult(0)}},
1094+
Expected: []sql.Row{{types.NewOkResult(1)}},
10951095
},
10961096
{
10971097
Query: "describe t;",
@@ -1156,7 +1156,7 @@ var AlterTableScripts = []ScriptTest{
11561156
{
11571157
Query: "alter table t modify column e enum('c', 'a', 'b');",
11581158
Expected: []sql.Row{
1159-
{types.NewOkResult(0)},
1159+
{types.NewOkResult(4)},
11601160
},
11611161
},
11621162
{
@@ -1171,7 +1171,7 @@ var AlterTableScripts = []ScriptTest{
11711171
{
11721172
Query: "alter table t modify column e enum('asdf', 'a', 'b', 'c');",
11731173
Expected: []sql.Row{
1174-
{types.NewOkResult(0)},
1174+
{types.NewOkResult(4)},
11751175
},
11761176
},
11771177
{
@@ -1186,7 +1186,7 @@ var AlterTableScripts = []ScriptTest{
11861186
{
11871187
Query: "alter table t modify column e enum('asdf', 'a', 'b', 'c', 'd');",
11881188
Expected: []sql.Row{
1189-
{types.NewOkResult(0)},
1189+
{types.NewOkResult(4)},
11901190
},
11911191
},
11921192
{
@@ -1201,7 +1201,7 @@ var AlterTableScripts = []ScriptTest{
12011201
{
12021202
Query: "alter table t modify column e enum('a', 'b', 'c');",
12031203
Expected: []sql.Row{
1204-
{types.NewOkResult(0)},
1204+
{types.NewOkResult(4)},
12051205
},
12061206
},
12071207
{
@@ -1244,7 +1244,7 @@ var AlterTableScripts = []ScriptTest{
12441244
{
12451245
Query: "alter table t modify column s set('a', 'b', 'c', 'd');",
12461246
Expected: []sql.Row{
1247-
{types.NewOkResult(0)},
1247+
{types.NewOkResult(8)},
12481248
},
12491249
},
12501250
{
@@ -2166,7 +2166,7 @@ var ModifyColumnScripts = []ScriptTest{
21662166
Assertions: []ScriptTestAssertion{
21672167
{
21682168
Query: "ALTER TABLE mytable MODIFY COLUMN i bigint NOT NULL COMMENT 'modified'",
2169-
Expected: []sql.Row{{types.NewOkResult(0)}},
2169+
Expected: []sql.Row{{types.NewOkResult(3)}},
21702170
},
21712171
{
21722172
Query: "SHOW FULL COLUMNS FROM mytable /* 1 */",
@@ -2177,7 +2177,7 @@ var ModifyColumnScripts = []ScriptTest{
21772177
},
21782178
{
21792179
Query: "ALTER TABLE mytable MODIFY COLUMN i TINYINT NOT NULL COMMENT 'yes' AFTER s",
2180-
Expected: []sql.Row{{types.NewOkResult(0)}},
2180+
Expected: []sql.Row{{types.NewOkResult(3)}},
21812181
},
21822182
{
21832183
Query: "SHOW FULL COLUMNS FROM mytable /* 2 */",
@@ -2188,7 +2188,7 @@ var ModifyColumnScripts = []ScriptTest{
21882188
},
21892189
{
21902190
Query: "ALTER TABLE mytable MODIFY COLUMN i BIGINT NOT NULL COMMENT 'ok' FIRST",
2191-
Expected: []sql.Row{{types.NewOkResult(0)}},
2191+
Expected: []sql.Row{{types.NewOkResult(3)}},
21922192
},
21932193
{
21942194
Query: "SHOW FULL COLUMNS FROM mytable /* 3 */",
@@ -2199,7 +2199,7 @@ var ModifyColumnScripts = []ScriptTest{
21992199
},
22002200
{
22012201
Query: "ALTER TABLE mytable MODIFY COLUMN s VARCHAR(20) NULL COMMENT 'changed'",
2202-
Expected: []sql.Row{{types.NewOkResult(0)}},
2202+
Expected: []sql.Row{{types.NewOkResult(3)}},
22032203
},
22042204
{
22052205
Query: "SHOW FULL COLUMNS FROM mytable /* 4 */",
@@ -2216,7 +2216,7 @@ var ModifyColumnScripts = []ScriptTest{
22162216
Assertions: []ScriptTestAssertion{
22172217
{
22182218
Query: "ALTER TABLE mytable MODIFY i BIGINT auto_increment",
2219-
Expected: []sql.Row{{types.NewOkResult(0)}},
2219+
Expected: []sql.Row{{types.NewOkResult(3)}},
22202220
},
22212221
{
22222222
Query: "SHOW FULL COLUMNS FROM mytable /* 1 */",
@@ -2249,7 +2249,7 @@ var ModifyColumnScripts = []ScriptTest{
22492249
},
22502250
{
22512251
Query: "ALTER TABLE mytable MODIFY COLUMN i BIGINT NOT NULL COMMENT 'ok' FIRST",
2252-
Expected: []sql.Row{{types.NewOkResult(0)}},
2252+
Expected: []sql.Row{{types.NewOkResult(4)}},
22532253
},
22542254
{
22552255
Query: "SHOW FULL COLUMNS FROM mytable /* 3 */",
@@ -2261,7 +2261,7 @@ var ModifyColumnScripts = []ScriptTest{
22612261
},
22622262
{
22632263
Query: "ALTER TABLE mytable MODIFY COLUMN s VARCHAR(20) NULL COMMENT 'changed'",
2264-
Expected: []sql.Row{{types.NewOkResult(0)}},
2264+
Expected: []sql.Row{{types.NewOkResult(4)}},
22652265
},
22662266
{
22672267
Query: "SHOW FULL COLUMNS FROM mytable /* 4 */",

‎enginetest/queries/charset_collation_engine.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
282282
{
283283
Query: "ALTER TABLE test2 MODIFY COLUMN v1 VARCHAR(100);",
284284
Expected: []sql.Row{
285-
{types.NewOkResult(0)},
285+
{types.NewOkResult(4)},
286286
},
287287
},
288288
{
@@ -342,7 +342,7 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
342342
{
343343
Query: "ALTER TABLE test2 CHANGE COLUMN v1 v1 VARCHAR(220);",
344344
Expected: []sql.Row{
345-
{types.NewOkResult(0)},
345+
{types.NewOkResult(4)},
346346
},
347347
},
348348
{

‎enginetest/queries/foreign_key_queries.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -513,11 +513,11 @@ var ForeignKeyTests = []ScriptTest{
513513
},
514514
{
515515
Query: "ALTER TABLE parent2 MODIFY v1 VARCHAR(30);",
516-
Expected: []sql.Row{{types.NewOkResult(0)}},
516+
Expected: []sql.Row{{types.NewOkResult(2)}},
517517
},
518518
{
519519
Query: "ALTER TABLE child2 MODIFY v1 VARCHAR(30);",
520-
Expected: []sql.Row{{types.NewOkResult(0)}},
520+
Expected: []sql.Row{{types.NewOkResult(1)}},
521521
},
522522
{
523523
Query: "ALTER TABLE parent3 MODIFY v1 BINARY(30);",
@@ -564,11 +564,11 @@ var ForeignKeyTests = []ScriptTest{
564564
},
565565
{
566566
Query: "ALTER TABLE parent1 MODIFY v2 BIGINT;",
567-
Expected: []sql.Row{{types.NewOkResult(0)}},
567+
Expected: []sql.Row{{types.NewOkResult(2)}},
568568
},
569569
{
570570
Query: "ALTER TABLE child1 MODIFY v2 BIGINT;",
571-
Expected: []sql.Row{{types.NewOkResult(0)}},
571+
Expected: []sql.Row{{types.NewOkResult(1)}},
572572
},
573573
},
574574
},

‎enginetest/queries/fulltext_queries.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ var FulltextTests = []ScriptTest{
733733
Assertions: []ScriptTestAssertion{
734734
{
735735
Query: "ALTER TABLE test MODIFY COLUMN v3 FLOAT AFTER pk;",
736-
Expected: []sql.Row{{types.NewOkResult(0)}},
736+
Expected: []sql.Row{{types.NewOkResult(5)}},
737737
},
738738
{
739739
Query: "SELECT * FROM test WHERE MATCH(v1, v2) AGAINST ('ghi');",
@@ -751,7 +751,7 @@ var FulltextTests = []ScriptTest{
751751
Assertions: []ScriptTestAssertion{
752752
{
753753
Query: "ALTER TABLE test MODIFY COLUMN v2 TEXT;",
754-
Expected: []sql.Row{{types.NewOkResult(0)}},
754+
Expected: []sql.Row{{types.NewOkResult(5)}},
755755
},
756756
{
757757
Query: "SELECT * FROM test WHERE MATCH(v1, v2) AGAINST ('ghi');",

‎enginetest/queries/script_queries.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3722,7 +3722,7 @@ CREATE TABLE tab3 (
37223722
},
37233723
{
37243724
Query: "ALTER TABLE TEST MODIFY COLUMN pk BIGINT AUTO_INCREMENT, AUTO_INCREMENT = 100",
3725-
Expected: []sql.Row{{types.NewOkResult(0)}},
3725+
Expected: []sql.Row{{types.NewOkResult(1)}},
37263726
},
37273727
{
37283728
Query: "INSERT INTO test (v2) values (11)",
@@ -11453,7 +11453,7 @@ var SpatialScriptTests = []ScriptTest{
1145311453
},
1145411454
{
1145511455
Query: "ALTER TABLE tab2 CHANGE COLUMN p p POINT NOT NULL",
11456-
Expected: []sql.Row{{types.NewOkResult(0)}},
11456+
Expected: []sql.Row{{types.NewOkResult(1)}},
1145711457
},
1145811458
{
1145911459
Query: "INSERT INTO tab2 VALUES (2, ST_GEOMFROMTEXT(ST_ASWKT(POINT(1, 6)), 4326))",
@@ -11473,7 +11473,7 @@ var SpatialScriptTests = []ScriptTest{
1147311473
},
1147411474
{
1147511475
Query: "ALTER TABLE tab2 CHANGE COLUMN p p POINT NOT NULL SRID 4326",
11476-
Expected: []sql.Row{{types.NewOkResult(0)}},
11476+
Expected: []sql.Row{{types.NewOkResult(1)}},
1147711477
},
1147811478
{
1147911479
Query: "show create table tab2",
@@ -11501,7 +11501,7 @@ var SpatialScriptTests = []ScriptTest{
1150111501
},
1150211502
{
1150311503
Query: "ALTER TABLE tab3 MODIFY COLUMN y POLYGON NOT NULL SRID 0",
11504-
Expected: []sql.Row{{types.NewOkResult(0)}},
11504+
Expected: []sql.Row{{types.NewOkResult(1)}},
1150511505
},
1150611506
{
1150711507
Query: "ALTER TABLE tab3 MODIFY COLUMN y POLYGON NOT NULL SRID 4326",
@@ -11513,7 +11513,7 @@ var SpatialScriptTests = []ScriptTest{
1151311513
},
1151411514
{
1151511515
Query: "ALTER TABLE tab3 MODIFY COLUMN y GEOMETRY NULL SRID 0",
11516-
Expected: []sql.Row{{types.NewOkResult(0)}},
11516+
Expected: []sql.Row{{types.NewOkResult(1)}},
1151711517
},
1151811518
{
1151911519
Query: "select i, ST_ASWKT(y) FROM tab3",
@@ -11565,7 +11565,7 @@ var SpatialScriptTests = []ScriptTest{
1156511565
},
1156611566
{
1156711567
Query: "ALTER TABLE table1 CHANGE COLUMN p p geometry srid 4326",
11568-
Expected: []sql.Row{{types.NewOkResult(0)}},
11568+
Expected: []sql.Row{{types.NewOkResult(1)}},
1156911569
},
1157011570
{
1157111571
Query: "show create table table1",

‎enginetest/queries/update_queries.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1342,7 +1342,7 @@ var OnUpdateExprScripts = []ScriptTest{
13421342
{
13431343
Query: "alter table t modify column ts timestamp default 0 on update current_timestamp;",
13441344
Expected: []sql.Row{
1345-
{types.NewOkResult(0)},
1345+
{types.NewOkResult(3)},
13461346
},
13471347
},
13481348
{

0 commit comments

Comments
 (0)