Merge pull request #3048 from dolthub/angela/keyless_subquery

Added field to ScriptTest to skip test

Author: angelamayxie

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/queries/script_queries.go

@@ -52,6 +52,9 @@ type ScriptTest struct {
 	// Dialect is the supported dialect for this script, which must match the dialect of the harness if specified.
 	// The script is skipped if the dialect doesn't match.
 	Dialect string
+	// Skip is used to completely skip a test, not execute any part of the script, and to record it as a skipped test in
+	// the test suite results.
+	Skip bool
 }
 
 type ScriptTestAssertion struct {