Skip to content

Commit d551d15

Browse files
jycormacneale4
jycor
and
macneale4
authored
Merge pull request #3046 from dolthub/macneale4-claude/query-ok (#3059)
Fix SET statements to return OkResult instead of empty rows Co-authored-by: Neil Macneale IV <[email protected]>
1 parent ef4499d commit d551d15

15 files changed

+131
-100
lines changed

‎enginetest/enginetests.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4118,7 +4118,7 @@ func TestVariables(t *testing.T, harness Harness) {
41184118
},
41194119
{
41204120
Query: "SET GLOBAL select_into_buffer_size = 9001",
4121-
Expected: []sql.Row{{}},
4121+
Expected: []sql.Row{{types.NewOkResult(0)}},
41224122
},
41234123
{
41244124
Query: "SELECT @@SESSION.select_into_buffer_size",
@@ -4130,7 +4130,7 @@ func TestVariables(t *testing.T, harness Harness) {
41304130
},
41314131
{
41324132
Query: "SET @@GLOBAL.select_into_buffer_size = 9002",
4133-
Expected: []sql.Row{{}},
4133+
Expected: []sql.Row{{types.NewOkResult(0)}},
41344134
},
41354135
{
41364136
Query: "SELECT @@GLOBAL.select_into_buffer_size",
@@ -4139,7 +4139,7 @@ func TestVariables(t *testing.T, harness Harness) {
41394139
{
41404140
// For boolean types, OFF/ON is converted
41414141
Query: "SET @@GLOBAL.activate_all_roles_on_login = 'ON'",
4142-
Expected: []sql.Row{{}},
4142+
Expected: []sql.Row{{types.NewOkResult(0)}},
41434143
},
41444144
{
41454145
Query: "SELECT @@GLOBAL.activate_all_roles_on_login",
@@ -4148,7 +4148,7 @@ func TestVariables(t *testing.T, harness Harness) {
41484148
{
41494149
// For non-boolean types, OFF/ON is not converted
41504150
Query: "SET @@GLOBAL.delay_key_write = 'OFF'",
4151-
Expected: []sql.Row{{}},
4151+
Expected: []sql.Row{{types.NewOkResult(0)}},
41524152
},
41534153
{
41544154
Query: "SELECT @@GLOBAL.delay_key_write",
@@ -4174,7 +4174,7 @@ func TestVariables(t *testing.T, harness Harness) {
41744174
},
41754175
{
41764176
Query: "SET GLOBAL select_into_buffer_size = 131072",
4177-
Expected: []sql.Row{{}},
4177+
Expected: []sql.Row{{types.NewOkResult(0)}},
41784178
},
41794179
} {
41804180
t.Run(assertion.Query, func(t *testing.T) {
@@ -5277,17 +5277,17 @@ func TestPersist(t *testing.T, harness Harness, newPersistableSess func(ctx *sql
52775277
}{
52785278
{
52795279
Query: "SET PERSIST max_connections = 1000;",
5280-
Expected: []sql.Row{{}},
5280+
Expected: []sql.Row{{types.NewOkResult(0)}},
52815281
ExpectedGlobal: int64(1000),
52825282
ExpectedPersist: int64(1000),
52835283
}, {
52845284
Query: "SET @@PERSIST.max_connections = 1000;",
5285-
Expected: []sql.Row{{}},
5285+
Expected: []sql.Row{{types.NewOkResult(0)}},
52865286
ExpectedGlobal: int64(1000),
52875287
ExpectedPersist: int64(1000),
52885288
}, {
52895289
Query: "SET PERSIST_ONLY max_connections = 1000;",
5290-
Expected: []sql.Row{{}},
5290+
Expected: []sql.Row{{types.NewOkResult(0)}},
52915291
ExpectedGlobal: int64(151),
52925292
ExpectedPersist: int64(1000),
52935293
},

‎enginetest/join_planning_tests.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"github.com/dolthub/go-mysql-server/sql/plan"
2929
"github.com/dolthub/go-mysql-server/sql/planbuilder"
3030
"github.com/dolthub/go-mysql-server/sql/transform"
31+
"github.com/dolthub/go-mysql-server/sql/types"
3132
)
3233

3334
type JoinPlanTest struct {
@@ -103,7 +104,7 @@ var JoinPlanningTests = []joinPlanScript{
103104
},
104105
{
105106
q: "set @@SESSION.disable_merge_join = 1",
106-
exp: []sql.Row{{}},
107+
exp: []sql.Row{{types.NewOkResult(0)}},
107108
},
108109
{
109110
q: "select /*+ JOIN_ORDER(ab, xy) MERGE_JOIN(ab, xy)*/ * from ab join xy on y = a order by 1, 3",

‎enginetest/queries/ansi_quotes_queries.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ var AnsiQuotesTests = []ScriptTest{
7171
{
7272
// Disable ANSI_QUOTES and make sure we can still run queries
7373
Query: `SET @@sql_mode='NO_ENGINE_SUBSTITUTION,ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES';`,
74-
Expected: []sql.Row{{}},
74+
Expected: []sql.Row{{types.NewOkResult(0)}},
7575
},
7676
{
7777
Query: `select "data" from auctions order by "ai" desc;`,
@@ -154,7 +154,7 @@ var AnsiQuotesTests = []ScriptTest{
154154
{
155155
// Disable ANSI_QUOTES mode
156156
Query: `SET @@sql_mode='NO_ENGINE_SUBSTITUTION,ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES';`,
157-
Expected: []sql.Row{{}},
157+
Expected: []sql.Row{{types.NewOkResult(0)}},
158158
},
159159
{
160160
Query: `show create table view1;`,
@@ -197,7 +197,7 @@ var AnsiQuotesTests = []ScriptTest{
197197
{
198198
// Disable ANSI_QUOTES mode
199199
Query: `SET @@sql_mode='NO_ENGINE_SUBSTITUTION,ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES';`,
200-
Expected: []sql.Row{{}},
200+
Expected: []sql.Row{{types.NewOkResult(0)}},
201201
},
202202
{
203203
Query: `insert into t values (2, 'George', 'SomethingElse');`,
@@ -237,7 +237,7 @@ var AnsiQuotesTests = []ScriptTest{
237237
{
238238
// Disable ANSI_QUOTES mode
239239
Query: `SET @@sql_mode='NO_ENGINE_SUBSTITUTION,ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES';`,
240-
Expected: []sql.Row{{}},
240+
Expected: []sql.Row{{types.NewOkResult(0)}},
241241
},
242242
{
243243
// Assert the procedure runs correctly with ANSI_QUOTES mode disabled
@@ -269,7 +269,7 @@ var AnsiQuotesTests = []ScriptTest{
269269
{
270270
// Disable ANSI_QUOTES mode
271271
Query: `SET @@sql_mode='NO_ENGINE_SUBSTITUTION,ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES';`,
272-
Expected: []sql.Row{{}},
272+
Expected: []sql.Row{{types.NewOkResult(0)}},
273273
},
274274
{
275275
// Insert a row with ANSI_QUOTES mode disabled
@@ -298,7 +298,7 @@ var AnsiQuotesTests = []ScriptTest{
298298
{
299299
// Disable ANSI_QUOTES mode
300300
Query: `SET @@sql_mode='NO_ENGINE_SUBSTITUTION,ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES';`,
301-
Expected: []sql.Row{{}},
301+
Expected: []sql.Row{{types.NewOkResult(0)}},
302302
},
303303
{
304304
// Assert the check constraint runs correctly when ANSI_QUOTES mode is disabled
@@ -328,7 +328,7 @@ var AnsiQuotesTests = []ScriptTest{
328328
{
329329
// Disable ANSI_QUOTES mode and make sure we can still list and run events
330330
Query: `SET @@sql_mode='NO_ENGINE_SUBSTITUTION,ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES';`,
331-
Expected: []sql.Row{{}},
331+
Expected: []sql.Row{{types.NewOkResult(0)}},
332332
},
333333
{
334334
Query: `SHOW EVENTS;`,

‎enginetest/queries/charset_collation_engine.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
463463
},
464464
{
465465
Query: "set @@session.character_set_connection = 'latin1';",
466-
Expected: []sql.Row{{}},
466+
Expected: []sql.Row{{types.NewOkResult(0)}},
467467
},
468468
{
469469
Query: "select @@session.character_set_connection, @@session.collation_connection;",
@@ -473,7 +473,7 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
473473
},
474474
{
475475
Query: "set @@session.collation_connection = 'utf8mb4_0900_bin';",
476-
Expected: []sql.Row{{}},
476+
Expected: []sql.Row{{types.NewOkResult(0)}},
477477
},
478478
{
479479
Query: "select @@session.character_set_connection, @@session.collation_connection;",
@@ -490,7 +490,7 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
490490
},
491491
{
492492
Query: "set @@global.character_set_connection = 'latin1';",
493-
Expected: []sql.Row{{}},
493+
Expected: []sql.Row{{types.NewOkResult(0)}},
494494
},
495495
{
496496
Query: "select @@global.character_set_connection, @@global.collation_connection;",
@@ -500,7 +500,7 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
500500
},
501501
{
502502
Query: "set @@global.collation_connection = 'utf8mb4_0900_bin';",
503-
Expected: []sql.Row{{}},
503+
Expected: []sql.Row{{types.NewOkResult(0)}},
504504
},
505505
{
506506
Query: "select @@global.character_set_connection, @@global.collation_connection;",
@@ -517,7 +517,7 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
517517
},
518518
{
519519
Query: "set @@session.character_set_server = 'latin1';",
520-
Expected: []sql.Row{{}},
520+
Expected: []sql.Row{{types.NewOkResult(0)}},
521521
},
522522
{
523523
Query: "select @@session.character_set_server, @@session.collation_server;",
@@ -527,7 +527,7 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
527527
},
528528
{
529529
Query: "set @@session.collation_server = 'utf8mb4_0900_bin';",
530-
Expected: []sql.Row{{}},
530+
Expected: []sql.Row{{types.NewOkResult(0)}},
531531
},
532532
{
533533
Query: "select @@session.character_set_server, @@session.collation_server;",
@@ -544,7 +544,7 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
544544
},
545545
{
546546
Query: "set @@global.character_set_server = 'latin1';",
547-
Expected: []sql.Row{{}},
547+
Expected: []sql.Row{{types.NewOkResult(0)}},
548548
},
549549
{
550550
Query: "select @@global.character_set_server, @@global.collation_server;",
@@ -554,7 +554,7 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
554554
},
555555
{
556556
Query: "set @@global.collation_server = 'utf8mb4_0900_bin';",
557-
Expected: []sql.Row{{}},
557+
Expected: []sql.Row{{types.NewOkResult(0)}},
558558
},
559559
{
560560
Query: "select @@global.character_set_server, @@global.collation_server;",
@@ -700,7 +700,7 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
700700
},
701701
{
702702
Query: "SET collation_connection = 'utf8mb4_0900_bin';",
703-
Expected: []sql.Row{{}},
703+
Expected: []sql.Row{{types.NewOkResult(0)}},
704704
},
705705
{
706706
Query: "SELECT COUNT(*) FROM test WHERE v1 LIKE 'ABC';",
@@ -760,7 +760,7 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
760760
},
761761
{
762762
Query: "SET collation_connection = 'utf8mb4_0900_bin';",
763-
Expected: []sql.Row{{}},
763+
Expected: []sql.Row{{types.NewOkResult(0)}},
764764
},
765765
{
766766
Query: "SELECT 'abc' LIKE 'ABC';",

‎enginetest/queries/charset_collation_wire.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ var CharsetCollationWireTests = []CharsetCollationWireTest{
476476
},
477477
{
478478
Query: "SET collation_connection = 'utf8mb4_0900_bin';",
479-
Expected: []sql.Row{{}},
479+
Expected: []sql.Row{{types.NewOkResult(0)}},
480480
},
481481
{
482482
Query: "SELECT COUNT(*) FROM test WHERE v1 LIKE 'ABC';",
@@ -536,7 +536,7 @@ var CharsetCollationWireTests = []CharsetCollationWireTest{
536536
},
537537
{
538538
Query: "SET collation_connection = 'utf8mb4_0900_bin';",
539-
Expected: []sql.Row{{}},
539+
Expected: []sql.Row{{types.NewOkResult(0)}},
540540
},
541541
{
542542
Query: "SELECT 'abc' LIKE 'ABC';",

‎enginetest/queries/foreign_key_queries.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1485,7 +1485,7 @@ var ForeignKeyTests = []ScriptTest{
14851485
},
14861486
{
14871487
Query: "SET FOREIGN_KEY_CHECKS=0;",
1488-
Expected: []sql.Row{{}},
1488+
Expected: []sql.Row{{types.NewOkResult(0)}},
14891489
},
14901490
{
14911491
Query: "TRUNCATE parent;",
@@ -1497,7 +1497,7 @@ var ForeignKeyTests = []ScriptTest{
14971497
},
14981498
{
14991499
Query: "SET FOREIGN_KEY_CHECKS=1;",
1500-
Expected: []sql.Row{{}},
1500+
Expected: []sql.Row{{types.NewOkResult(0)}},
15011501
},
15021502
{
15031503
Query: "INSERT INTO child VALUES (4, 5, 6);",
@@ -2777,7 +2777,7 @@ var CreateForeignKeyTests = []ScriptTest{
27772777
Assertions: []ScriptTestAssertion{
27782778
{
27792779
Query: "SET FOREIGN_KEY_CHECKS=0;",
2780-
Expected: []sql.Row{{}},
2780+
Expected: []sql.Row{{types.NewOkResult(0)}},
27812781
},
27822782
{
27832783
Query: "CREATE TABLE child4 (pk BIGINT PRIMARY KEY, CONSTRAINT fk_child4 FOREIGN KEY (pk) REFERENCES delayed_parent4 (pk))",

‎enginetest/queries/index_queries.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4011,7 +4011,7 @@ var IndexPrefixQueries = []ScriptTest{
40114011
Assertions: []ScriptTestAssertion{
40124012
{
40134013
Query: "set @@strict_mysql_compatibility = true;",
4014-
Expected: []sql.Row{{}},
4014+
Expected: []sql.Row{{types.NewOkResult(0)}},
40154015
},
40164016
{
40174017
Query: "select @@strict_mysql_compatibility;",

‎enginetest/queries/procedure_queries.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -325,20 +325,20 @@ END`,
325325
// need to filter out Result Sets that should be completely omitted.
326326
{
327327
Query: "CALL p1(0)",
328-
Expected: []sql.Row{{}},
328+
Expected: []sql.Row{{types.NewOkResult(0)}},
329329
},
330330
{
331331
Query: "CALL p1(1)",
332-
Expected: []sql.Row{{}},
332+
Expected: []sql.Row{{types.NewOkResult(0)}},
333333
},
334334
{
335335
Query: "CALL p1(2)",
336-
Expected: []sql.Row{{}},
336+
Expected: []sql.Row{{types.NewOkResult(0)}},
337337
},
338338
{
339339
// https://github.com/dolthub/dolt/issues/6230
340340
Query: "CALL p1(200)",
341-
Expected: []sql.Row{{}},
341+
Expected: []sql.Row{{types.NewOkResult(0)}},
342342
},
343343
},
344344
},
@@ -359,15 +359,15 @@ END`,
359359
// need to filter out Result Sets that should be completely omitted.
360360
{
361361
Query: "CALL p1(0)",
362-
Expected: []sql.Row{{}},
362+
Expected: []sql.Row{{types.NewOkResult(0)}},
363363
},
364364
{
365365
Query: "CALL p1(1)",
366-
Expected: []sql.Row{{}},
366+
Expected: []sql.Row{{types.NewOkResult(0)}},
367367
},
368368
{
369369
Query: "CALL p1(2)",
370-
Expected: []sql.Row{{}},
370+
Expected: []sql.Row{{types.NewOkResult(0)}},
371371
},
372372
},
373373
},
@@ -985,7 +985,7 @@ END;`,
985985
Assertions: []ScriptTestAssertion{
986986
{
987987
Query: "SET @x = 2;",
988-
Expected: []sql.Row{{}},
988+
Expected: []sql.Row{{types.NewOkResult(0)}},
989989
},
990990
{
991991
// TODO: Set statements don't return anything for whatever reason
@@ -2270,7 +2270,7 @@ end;
22702270
Assertions: []ScriptTestAssertion{
22712271
{
22722272
Query: "call proc();",
2273-
Expected: []sql.Row{{}},
2273+
Expected: []sql.Row{{types.NewOkResult(0)}},
22742274
},
22752275
{
22762276
Query: "select @v;",

‎enginetest/queries/queries.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5728,15 +5728,15 @@ SELECT * FROM cte WHERE d = 2;`,
57285728
sql.Collation_Default.CharacterSet().String() +
57295729
" */",
57305730
Expected: []sql.Row{
5731-
{},
5731+
{types.NewOkResult(0)},
57325732
},
57335733
},
57345734
{
57355735
Query: "SET collation_connection = '" +
57365736
sql.Collation_Default.String() +
57375737
"';",
57385738
Expected: []sql.Row{
5739-
{},
5739+
{types.NewOkResult(0)},
57405740
},
57415741
},
57425742
{

0 commit comments

Comments
 (0)