From 8fce5372211af7b2c9cac133ff91914572330ee3 Mon Sep 17 00:00:00 2001 From: Rohit Nayak Date: Tue, 5 Nov 2024 16:31:34 +0100 Subject: [PATCH] Fix merge issues Signed-off-by: Rohit Nayak --- go/vt/vtgate/semantics/analyzer_test.go | 7 ------- go/vt/vtgate/semantics/early_rewriter_test.go | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/go/vt/vtgate/semantics/analyzer_test.go b/go/vt/vtgate/semantics/analyzer_test.go index ed1fa5a532a..5062819a88b 100644 --- a/go/vt/vtgate/semantics/analyzer_test.go +++ b/go/vt/vtgate/semantics/analyzer_test.go @@ -1259,16 +1259,9 @@ var ks3 = &vindexes.Keyspace{ func fakeSchemaInfo() *FakeSI { si := &FakeSI{ Tables: map[string]*vindexes.Table{ -<<<<<<< HEAD "t": tableT(), "t1": tableT1(), "t2": tableT2(), -======= - "t": {Name: sqlparser.NewIdentifierCS("t"), Keyspace: unsharded}, - "t3": {Name: sqlparser.NewIdentifierCS("t3"), Keyspace: unsharded}, - "t1": {Name: sqlparser.NewIdentifierCS("t1"), Columns: cols1, ColumnListAuthoritative: true, Keyspace: ks2}, - "t2": {Name: sqlparser.NewIdentifierCS("t2"), Columns: cols2, ColumnListAuthoritative: true, Keyspace: ks3}, ->>>>>>> 5c08da6a5d (Bugfix for Panic on Joined Queries with Non-Authoritative Tables in Vitess 19.0 (#17103)) }, } return si diff --git a/go/vt/vtgate/semantics/early_rewriter_test.go b/go/vt/vtgate/semantics/early_rewriter_test.go index 9cd409c8707..5286b0798a4 100644 --- a/go/vt/vtgate/semantics/early_rewriter_test.go +++ b/go/vt/vtgate/semantics/early_rewriter_test.go @@ -749,7 +749,7 @@ func TestOrderByNotAllColumnsAuthoritative(t *testing.T) { }} for _, tcase := range tcases { t.Run(tcase.sql, func(t *testing.T) { - ast, err := sqlparser.NewTestParser().Parse(tcase.sql) + ast, err := sqlparser.Parse(tcase.sql) require.NoError(t, err) selectStatement := ast.(sqlparser.SelectStatement) semTable, err := Analyze(selectStatement, cDB, schemaInfo)