Skip to content

Commit 622acbd

Browse files
macneale4claude
macneale4
and
claude
committed
Fix transaction query tests to expect OkResult for SET statements
- Fixed all remaining SET autocommit statements in transaction_queries.go - All 27 remaining empty row expectations updated to types.NewOkResult(0) - Covers SET @@autocommit and SET autocommit variations in transaction tests - This completes the comprehensive fix for all SET statement expectations across the codebase All tests now pass. This should resolve the CI failures. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
1 parent 11a9487 commit 622acbd

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

‎enginetest/queries/transaction_queries.go

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ var TransactionTests = []TransactionTest{
4040
Assertions: []ScriptTestAssertion{
4141
{
4242
Query: "/* client a */ set @@autocommit = 0;",
43-
Expected: []sql.Row{{}},
43+
Expected: []sql.Row{{types.NewOkResult(0)}},
4444
},
4545
{
4646
Query: "/* client b */ set @@autocommit = 0;",
47-
Expected: []sql.Row{{}},
47+
Expected: []sql.Row{{types.NewOkResult(0)}},
4848
},
4949
{
5050
Query: "/* client a */ select @@autocommit;",
@@ -120,11 +120,11 @@ var TransactionTests = []TransactionTest{
120120
Assertions: []ScriptTestAssertion{
121121
{
122122
Query: "/* client a */ set autocommit = off",
123-
Expected: []sql.Row{{}},
123+
Expected: []sql.Row{{types.NewOkResult(0)}},
124124
},
125125
{
126126
Query: "/* client b */ set autocommit = off",
127-
Expected: []sql.Row{{}},
127+
Expected: []sql.Row{{types.NewOkResult(0)}},
128128
},
129129
{
130130
Query: "/* client b */ select * from t order by x",
@@ -191,11 +191,11 @@ var TransactionTests = []TransactionTest{
191191
Assertions: []ScriptTestAssertion{
192192
{
193193
Query: "/* client a */ set autocommit = off",
194-
Expected: []sql.Row{{}},
194+
Expected: []sql.Row{{types.NewOkResult(0)}},
195195
},
196196
{
197197
Query: "/* client b */ set autocommit = off",
198-
Expected: []sql.Row{{}},
198+
Expected: []sql.Row{{types.NewOkResult(0)}},
199199
},
200200
{
201201
Query: "/* client b */ insert into t values (2,2)",
@@ -208,7 +208,7 @@ var TransactionTests = []TransactionTest{
208208
// should commit any pending transaction
209209
{
210210
Query: "/* client b */ set autocommit = on",
211-
Expected: []sql.Row{{}},
211+
Expected: []sql.Row{{types.NewOkResult(0)}},
212212
},
213213
{
214214
Query: "/* client a */ select * from t order by x",
@@ -217,7 +217,7 @@ var TransactionTests = []TransactionTest{
217217
// client a sees the committed transaction from client b when it begins a new transaction
218218
{
219219
Query: "/* client a */ set autocommit = on",
220-
Expected: []sql.Row{{}},
220+
Expected: []sql.Row{{types.NewOkResult(0)}},
221221
},
222222
{
223223
Query: "/* client a */ select * from t order by x",
@@ -283,11 +283,11 @@ var TransactionTests = []TransactionTest{
283283
Assertions: []ScriptTestAssertion{
284284
{
285285
Query: "/* client a */ set autocommit = off",
286-
Expected: []sql.Row{{}},
286+
Expected: []sql.Row{{types.NewOkResult(0)}},
287287
},
288288
{
289289
Query: "/* client b */ set autocommit = off",
290-
Expected: []sql.Row{{}},
290+
Expected: []sql.Row{{types.NewOkResult(0)}},
291291
},
292292
{
293293
Query: "/* client a */ start transaction",
@@ -360,11 +360,11 @@ var TransactionTests = []TransactionTest{
360360
Assertions: []ScriptTestAssertion{
361361
{
362362
Query: "/* client a */ set autocommit = off",
363-
Expected: []sql.Row{{}},
363+
Expected: []sql.Row{{types.NewOkResult(0)}},
364364
},
365365
{
366366
Query: "/* client b */ set autocommit = off",
367-
Expected: []sql.Row{{}},
367+
Expected: []sql.Row{{types.NewOkResult(0)}},
368368
},
369369
{
370370
Query: "/* client a */ start transaction",
@@ -529,11 +529,11 @@ var TransactionTests = []TransactionTest{
529529
Assertions: []ScriptTestAssertion{
530530
{
531531
Query: "/* client a */ set autocommit = off",
532-
Expected: []sql.Row{{}},
532+
Expected: []sql.Row{{types.NewOkResult(0)}},
533533
},
534534
{
535535
Query: "/* client b */ set autocommit = off",
536-
Expected: []sql.Row{{}},
536+
Expected: []sql.Row{{types.NewOkResult(0)}},
537537
},
538538
{
539539
Query: "/* client a */ start transaction",
@@ -666,15 +666,15 @@ var TransactionTests = []TransactionTest{
666666
Assertions: []ScriptTestAssertion{
667667
{
668668
Query: "/* client a */ set autocommit = off",
669-
Expected: []sql.Row{{}},
669+
Expected: []sql.Row{{types.NewOkResult(0)}},
670670
},
671671
{
672672
Query: "/* client b */ set autocommit = off",
673-
Expected: []sql.Row{{}},
673+
Expected: []sql.Row{{types.NewOkResult(0)}},
674674
},
675675
{
676676
Query: "/* client c */ set autocommit = off",
677-
Expected: []sql.Row{{}},
677+
Expected: []sql.Row{{types.NewOkResult(0)}},
678678
},
679679
// Client a starts by insert into t
680680
{
@@ -958,7 +958,7 @@ var TransactionTests = []TransactionTest{
958958
Assertions: []ScriptTestAssertion{
959959
{
960960
Query: "/* client a */ set autocommit = off",
961-
Expected: []sql.Row{{}},
961+
Expected: []sql.Row{{types.NewOkResult(0)}},
962962
},
963963
{
964964
Query: "/* client a */ create temporary table tmp(pk int primary key)",
@@ -1074,7 +1074,7 @@ var TransactionTests = []TransactionTest{
10741074
Assertions: []ScriptTestAssertion{
10751075
{
10761076
Query: "/* client a */ set @@autocommit = 0;",
1077-
Expected: []sql.Row{{}},
1077+
Expected: []sql.Row{{types.NewOkResult(0)}},
10781078
},
10791079
{
10801080
Query: "/* client a */ start transaction;",
@@ -1131,7 +1131,7 @@ var TransactionTests = []TransactionTest{
11311131

11321132
{
11331133
Query: "/* client a */ set @@autocommit = 0;",
1134-
Expected: []sql.Row{{}},
1134+
Expected: []sql.Row{{types.NewOkResult(0)}},
11351135
},
11361136
{
11371137
Query: "/* client a */ start transaction;",
@@ -1243,7 +1243,7 @@ var TransactionTests = []TransactionTest{
12431243
Assertions: []ScriptTestAssertion{
12441244
{
12451245
Query: "/* client a */ set @@autocommit = 0;",
1246-
Expected: []sql.Row{{}},
1246+
Expected: []sql.Row{{types.NewOkResult(0)}},
12471247
},
12481248
{
12491249
Query: "/* client a */ start transaction;",
@@ -1285,7 +1285,7 @@ var TransactionTests = []TransactionTest{
12851285
Assertions: []ScriptTestAssertion{
12861286
{
12871287
Query: "/* client a */ set @@autocommit = 0;",
1288-
Expected: []sql.Row{{}},
1288+
Expected: []sql.Row{{types.NewOkResult(0)}},
12891289
},
12901290
{
12911291
Query: "/* client a */ start transaction;",
@@ -1327,7 +1327,7 @@ var TransactionTests = []TransactionTest{
13271327
Assertions: []ScriptTestAssertion{
13281328
{
13291329
Query: "/* client a */ set @@autocommit = 0;",
1330-
Expected: []sql.Row{{}},
1330+
Expected: []sql.Row{{types.NewOkResult(0)}},
13311331
},
13321332
{
13331333
Query: "/* client a */ start transaction;",
@@ -1365,7 +1365,7 @@ var TransactionTests = []TransactionTest{
13651365
Assertions: []ScriptTestAssertion{
13661366
{
13671367
Query: "/* client a */ set @@autocommit = 0;",
1368-
Expected: []sql.Row{{}},
1368+
Expected: []sql.Row{{types.NewOkResult(0)}},
13691369
},
13701370
{
13711371
Query: "/* client a */ start transaction;",
@@ -1386,7 +1386,7 @@ var TransactionTests = []TransactionTest{
13861386
Assertions: []ScriptTestAssertion{
13871387
{
13881388
Query: "/* client a */ set @@autocommit = 0;",
1389-
Expected: []sql.Row{{}},
1389+
Expected: []sql.Row{{types.NewOkResult(0)}},
13901390
},
13911391
{
13921392
Query: "/* client a */ start transaction;",
@@ -1408,7 +1408,7 @@ var TransactionTests = []TransactionTest{
14081408
Assertions: []ScriptTestAssertion{
14091409
{
14101410
Query: "/* client a */ set @@autocommit = 0;",
1411-
Expected: []sql.Row{{}},
1411+
Expected: []sql.Row{{types.NewOkResult(0)}},
14121412
},
14131413
{
14141414
Query: "/* client a */ start transaction;",
@@ -1430,7 +1430,7 @@ var TransactionTests = []TransactionTest{
14301430
Assertions: []ScriptTestAssertion{
14311431
{
14321432
Query: "/* client a */ set @@autocommit = 0;",
1433-
Expected: []sql.Row{{}},
1433+
Expected: []sql.Row{{types.NewOkResult(0)}},
14341434
},
14351435
{
14361436
Query: "/* client a */ start transaction;",

0 commit comments

Comments
 (0)