test: make e2e plan-tests run DML cases

Signed-off-by: Andres Taylor <[email protected]>
vitessio · Dec 20, 2024 · 4565dca · 4565dca
1 parent 4798918
commit 4565dca
Show file tree

Hide file tree

Showing 4 changed files with 489 additions and 247 deletions.
diff --git a/go/test/endtoend/vtgate/plan_tests/plan_e2e_test.go b/go/test/endtoend/vtgate/plan_tests/plan_e2e_test.go
@@ -23,7 +23,7 @@ import (
 )
 
 func TestE2ECases(t *testing.T) {
-	e2eTestCaseFiles := []string{"select_cases.json", "filter_cases.json"}
+	e2eTestCaseFiles := []string{"select_cases.json", "filter_cases.json", "dml_cases.json"}
 	mcmp, closer := start(t)
 	defer closer()
 	loadSampleData(t, mcmp)

diff --git a/go/vt/vtgate/engine/plan_description.go b/go/vt/vtgate/engine/plan_description.go
@@ -152,7 +152,11 @@ func PrimitiveDescriptionFromMap(data map[string]any) (pd PrimitiveDescription,
 		}
 	}
 	if ttt, isPresent := data["TargetTabletType"]; isPresent {
-		pd.TargetTabletType = topodatapb.TabletType(ttt.(int))
+		val, ok := topodatapb.TabletType_value[ttt.(string)]
+		if !ok {
+			panic(fmt.Sprintf("TargetTabletType is not a valid tablet type: %v", ttt))
+		}
+		pd.TargetTabletType = topodatapb.TabletType(val)
 	}
 	if other, isPresent := data["Other"]; isPresent {
 		pd.Other = other.(map[string]any)

diff --git a/go/vt/vtgate/planbuilder/plan_test.go b/go/vt/vtgate/planbuilder/plan_test.go
@@ -666,7 +666,7 @@ func (s *planTestSuite) testFile(filename string, vschema *vschemawrapper.VSchem
 			current := PlanTest{
 				Comment: tcase.Comment,
 				Query:   tcase.Query,
-				SkipE2E: tcase.SkipE2E,
+				SkipE2E: true,
 			}
 			vschema.Version = Gen4
 			out := getPlanOutput(tcase, vschema, render)