From 7adc5fc17e176ca7f6c290b2c04b13d3a816200d Mon Sep 17 00:00:00 2001 From: Arthur Schreiber Date: Thu, 4 Dec 2025 20:32:30 +0000 Subject: [PATCH] Update test cases to handle changes in behaviour in future versions. Signed-off-by: Arthur Schreiber --- go/test/endtoend/preparestmt/stmt_methods_test.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/go/test/endtoend/preparestmt/stmt_methods_test.go b/go/test/endtoend/preparestmt/stmt_methods_test.go index 8b38b717425..1f4d232bcff 100644 --- a/go/test/endtoend/preparestmt/stmt_methods_test.go +++ b/go/test/endtoend/preparestmt/stmt_methods_test.go @@ -28,6 +28,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "vitess.io/vitess/go/test/endtoend/cluster" "vitess.io/vitess/go/vt/vtgate/engine" ) @@ -570,7 +571,17 @@ func validateBaselineErrSpecializedPlan(t *testing.T, p map[string]any) { pm, ok := plan.(map[string]any) require.True(t, ok, "plan is not of type map[string]any") require.EqualValues(t, "PlanSwitcher", pm["OperatorType"]) - require.EqualValues(t, "VT12001: unsupported: OVER CLAUSE with sharded keyspace", pm["BaselineErr"]) + + ver, err := cluster.GetMajorVersion("vtgate") + require.NoError(t, err) + + // v24+ uses new error message format + // v23 and earlier uses old format + expectedErr := "VT12001: unsupported: window functions are only supported for single-shard queries" + if ver < 24 { + expectedErr = "VT12001: unsupported: OVER CLAUSE with sharded keyspace" + } + require.EqualValues(t, expectedErr, pm["BaselineErr"].(string)) pd, err := engine.PrimitiveDescriptionFromMap(plan.(map[string]any)) require.NoError(t, err)