Merge branch 'main' into zachmu/split-queries

Author: zachmu

enginetest/enginetests.go

@@ -4144,7 +4144,7 @@ func TestVariables(t *testing.T, harness Harness) {
 		},
 		{
 			Query:    "SET GLOBAL select_into_buffer_size = 9001",
-			Expected: []sql.Row{{}},
+			Expected: []sql.Row{{types.NewOkResult(0)}},
 		},
 		{
 			Query:    "SELECT @@SESSION.select_into_buffer_size",
@@ -4156,7 +4156,7 @@ func TestVariables(t *testing.T, harness Harness) {
 		},
 		{
 			Query:    "SET @@GLOBAL.select_into_buffer_size = 9002",
-			Expected: []sql.Row{{}},
+			Expected: []sql.Row{{types.NewOkResult(0)}},
 		},
 		{
 			Query:    "SELECT @@GLOBAL.select_into_buffer_size",
@@ -4165,7 +4165,7 @@ func TestVariables(t *testing.T, harness Harness) {
 		{
 			// For boolean types, OFF/ON is converted
 			Query:    "SET @@GLOBAL.activate_all_roles_on_login = 'ON'",
-			Expected: []sql.Row{{}},
+			Expected: []sql.Row{{types.NewOkResult(0)}},
 		},
 		{
 			Query:    "SELECT @@GLOBAL.activate_all_roles_on_login",
@@ -4174,7 +4174,7 @@ func TestVariables(t *testing.T, harness Harness) {
 		{
 			// For non-boolean types, OFF/ON is not converted
 			Query:    "SET @@GLOBAL.delay_key_write = 'OFF'",
-			Expected: []sql.Row{{}},
+			Expected: []sql.Row{{types.NewOkResult(0)}},
 		},
 		{
 			Query:    "SELECT @@GLOBAL.delay_key_write",
@@ -4200,7 +4200,7 @@ func TestVariables(t *testing.T, harness Harness) {
 		},
 		{
 			Query:    "SET GLOBAL select_into_buffer_size = 131072",
-			Expected: []sql.Row{{}},
+			Expected: []sql.Row{{types.NewOkResult(0)}},
 		},
 	} {
 		t.Run(assertion.Query, func(t *testing.T) {
@@ -5303,17 +5303,17 @@ func TestPersist(t *testing.T, harness Harness, newPersistableSess func(ctx *sql
 	}{
 		{
 			Query:           "SET PERSIST max_connections = 1000;",
-			Expected:        []sql.Row{{}},
+			Expected:        []sql.Row{{types.NewOkResult(0)}},
 			ExpectedGlobal:  int64(1000),
 			ExpectedPersist: int64(1000),
 		}, {
 			Query:           "SET @@PERSIST.max_connections = 1000;",
-			Expected:        []sql.Row{{}},
+			Expected:        []sql.Row{{types.NewOkResult(0)}},
 			ExpectedGlobal:  int64(1000),
 			ExpectedPersist: int64(1000),
 		}, {
 			Query:           "SET PERSIST_ONLY max_connections = 1000;",
-			Expected:        []sql.Row{{}},
+			Expected:        []sql.Row{{types.NewOkResult(0)}},
 			ExpectedGlobal:  int64(151),
 			ExpectedPersist: int64(1000),
 		},

enginetest/evaluation.go

@@ -84,14 +84,8 @@ func TestScriptWithEngine(t *testing.T, e QueryEngine, harness Harness, script q
 	require.NoError(t, err, nil)
 
 	t.Run(script.Name, func(t *testing.T) {
-		if sh, ok := harness.(SkippingHarness); ok {
-			if sh.SkipQueryTest(script.Name) {
-				t.Skip()
-			}
-
-			if !supportedDialect(harness, script.Dialect) {
-				t.Skip()
-			}
+		if skipScript(harness, script, false) {
+			t.Skip()
 		}
 
 		for _, statement := range script.SetUpScript {
@@ -126,7 +120,7 @@ func TestScriptWithEngine(t *testing.T, e QueryEngine, harness Harness, script q
 					ctx = th.NewSession()
 				}
 
-				if skipAssertion(t, harness, assertion) {
+				if skipAssertion(harness, assertion) {
 					t.Skip()
 				}
 
@@ -161,30 +155,26 @@ func TestScriptWithEngine(t *testing.T, e QueryEngine, harness Harness, script q
 	})
 }
 
-func skipAssertion(t *testing.T, harness Harness, assertion queries.ScriptTestAssertion) bool {
-	if sh, ok := harness.(SkippingHarness); ok && sh.SkipQueryTest(assertion.Query) {
+func skipScript(harness Harness, script queries.ScriptTest, prepared bool) bool {
+	if sh, ok := harness.(SkippingHarness); ok && sh.SkipQueryTest(script.Name) {
 		return true
 	}
 
-	if !supportedDialect(harness, assertion.Dialect) {
-		return true
-	}
+	return script.Skip || !supportedDialect(harness, script.Dialect) || (prepared && script.SkipPrepared)
+}
 
-	if assertion.Skip {
+func skipAssertion(harness Harness, assertion queries.ScriptTestAssertion) bool {
+	if sh, ok := harness.(SkippingHarness); ok && sh.SkipQueryTest(assertion.Query) {
 		return true
 	}
 
-	return false
+	return assertion.Skip || !supportedDialect(harness, assertion.Dialect)
 }
 
 // TestScriptPrepared substitutes literals for bindvars, runs the test script given,
 // and makes any assertions given
 func TestScriptPrepared(t *testing.T, harness Harness, script queries.ScriptTest) bool {
 	return t.Run(script.Name, func(t *testing.T) {
-		if script.SkipPrepared {
-			t.Skip()
-		}
-
 		e := mustNewEngine(t, harness)
 		defer e.Close()
 		TestScriptWithEnginePrepared(t, e, harness, script)
@@ -194,6 +184,10 @@ func TestScriptPrepared(t *testing.T, harness Harness, script queries.ScriptTest
 // TestScriptWithEnginePrepared runs the test script with bindvars substituted for literals
 // using the engine provided.
 func TestScriptWithEnginePrepared(t *testing.T, e QueryEngine, harness Harness, script queries.ScriptTest) {
+	if skipScript(harness, script, true) {
+		t.Skip()
+	}
+
 	ctx := NewContext(harness)
 	err := CreateNewConnectionForServerEngine(ctx, e)
 	require.NoError(t, err, nil)
@@ -223,13 +217,7 @@ func TestScriptWithEnginePrepared(t *testing.T, e QueryEngine, harness Harness,
 
 	for _, assertion := range assertions {
 		t.Run(assertion.Query, func(t *testing.T) {
-
-			if sh, ok := harness.(SkippingHarness); ok {
-				if sh.SkipQueryTest(assertion.Query) {
-					t.Skip()
-				}
-			}
-			if assertion.Skip {
+			if skipAssertion(harness, assertion) {
 				t.Skip()
 			}
 

enginetest/join_planning_tests.go

@@ -28,6 +28,7 @@ import (
 	"github.com/dolthub/go-mysql-server/sql/plan"
 	"github.com/dolthub/go-mysql-server/sql/planbuilder"
 	"github.com/dolthub/go-mysql-server/sql/transform"
+	"github.com/dolthub/go-mysql-server/sql/types"
 )
 
 type JoinPlanTest struct {
@@ -103,7 +104,7 @@ var JoinPlanningTests = []joinPlanScript{
 			},
 			{
 				q:   "set @@SESSION.disable_merge_join = 1",
-				exp: []sql.Row{{}},
+				exp: []sql.Row{{types.NewOkResult(0)}},
 			},
 			{
 				q:     "select /*+ JOIN_ORDER(ab, xy) MERGE_JOIN(ab, xy)*/ * from ab join xy on y = a order by 1, 3",