Merge pull request #1052 from dolthub/andy/parameterize-query-plan-tests

enginetest:  Parameterize query plan tests

Author: andy-wm-arthur

enginetest/enginetests.go

@@ -245,11 +245,11 @@ func TestReadOnlyDatabases(t *testing.T, harness Harness) {
 
 // Tests generating the correct query plans for various queries using databases and tables provided by the given
 // harness.
-func TestQueryPlans(t *testing.T, harness Harness) {
+func TestQueryPlans(t *testing.T, harness Harness, planTests []queries.QueryPlanTest) {
 	harness.Setup(setup.SimpleSetup...)
 	e := mustNewEngine(t, harness)
 	defer e.Close()
-	for _, tt := range queries.PlanTests {
+	for _, tt := range planTests {
 		TestQueryPlan(t, harness, e, tt.Query, tt.ExpectedPlan)
 	}
 }
@@ -351,7 +351,7 @@ func TestQueryPlan(t *testing.T, harness Harness, e *sqle.Engine, query string,
 			}
 		}
 
-		assert.Equal(t, expectedPlan, extractQueryNode(node).String(), "Unexpected result for query: "+query)
+		assert.Equal(t, expectedPlan, ExtractQueryNode(node).String(), "Unexpected result for query: "+query)
 	})
 
 }
@@ -371,7 +371,7 @@ func TestQueryPlanWithEngine(t *testing.T, harness Harness, e *sqle.Engine, tt q
 			}
 		}
 
-		assert.Equal(t, tt.ExpectedPlan, extractQueryNode(node).String(), "Unexpected result for query: "+tt.Query)
+		assert.Equal(t, tt.ExpectedPlan, ExtractQueryNode(node).String(), "Unexpected result for query: "+tt.Query)
 	})
 
 }

enginetest/evaluation.go

@@ -691,12 +691,12 @@ func assertSchemasEqualWithDefaults(t *testing.T, expected, actual sql.Schema) b
 	return assert.Equal(t, ec, ac)
 }
 
-func extractQueryNode(node sql.Node) sql.Node {
+func ExtractQueryNode(node sql.Node) sql.Node {
 	switch node := node.(type) {
 	case *plan.QueryProcess:
-		return extractQueryNode(node.Child())
+		return ExtractQueryNode(node.Child())
 	case *analyzer.Releaser:
-		return extractQueryNode(node.Child)
+		return ExtractQueryNode(node.Child)
 	default:
 		return node
 	}

enginetest/memory_engine_test.go

@@ -320,7 +320,7 @@ func TestQueryPlans(t *testing.T) {
 			harness := enginetest.NewMemoryHarness(indexInit.name, 1, 2, indexInit.nativeIndexes, indexInit.driverInitializer)
 			// The IN expression requires mergeable indexes meaning that an unmergeable index returns a different result, so we skip this test
 			harness.QueriesToSkip("SELECT a.* FROM mytable a inner join mytable b on (a.i = b.s) WHERE a.i in (1, 2, 3, 4)")
-			enginetest.TestQueryPlans(t, harness)
+			enginetest.TestQueryPlans(t, harness, queries.PlanTests)
 		})
 	}
 }

enginetest/testgen_test.go

@@ -45,7 +45,7 @@ func TestWriteQueryPlans(t *testing.T) {
 
 		node, err := engine.Analyzer.Analyze(ctx, parsed, nil)
 		require.NoError(t, err)
-		planString := extractQueryNode(node).String()
+		planString := ExtractQueryNode(node).String()
 
 		if strings.Contains(tt.Query, "`") {
 			_, _ = w.WriteString(fmt.Sprintf(`Query: "%s",`, tt.Query))
@@ -102,7 +102,7 @@ func TestWriteIndexQueryPlans(t *testing.T) {
 
 		node, err := engine.Analyzer.Analyze(ctx, parsed, nil)
 		require.NoError(t, err)
-		planString := extractQueryNode(node).String()
+		planString := ExtractQueryNode(node).String()
 
 		if strings.Contains(tt.Query, "`") {
 			_, _ = w.WriteString(fmt.Sprintf(`Query: "%s",`, tt.Query))