Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor(parser): change GetQuerySpan to accept Statement instead of raw string (#18945)
h3n4ld92e21235d2e
diff --git a/backend/api/v1/sql_service.go b/backend/api/v1/sql_service.goindex 883022c3bd..0337c88e13 100644--- a/backend/api/v1/sql_service.go+++ b/backend/api/v1/sql_service.go@@ -468,6 +468,11 @@ func queryRetry(var spans []*parserbase.QuerySpanvar sensitivePredicateColumns [][]parserbase.ColumnResourcevar err error+ // Split the statement once at entry point+ statements, err := parserbase.SplitMultiSQL(instance.Metadata.GetEngine(), statement)+ if err != nil {+ return nil, nil, time.Duration(0), err+ }if !queryContext.Explain {spans, err = parserbase.GetQuerySpan(ctx,@@ -478,7 +483,7 @@ func queryRetry(GetLinkedDatabaseMetadataFunc: BuildGetLinkedDatabaseMetadataFunc(stores, instance.Metadata.GetEngine()),},instance.Metadata.GetEngine(),- statement,+ statements,database.DatabaseName,queryContext.Schema,!store.IsObjectCaseSensitive(instance),@@ -561,7 +566,7 @@ func queryRetry(GetLinkedDatabaseMetadataFunc: BuildGetLinkedDatabaseMetadataFunc(stores, instance.Metadata.GetEngine()),},instance.Metadata.GetEngine(),- statement,+ statements,database.DatabaseName,queryContext.Schema,!store.IsObjectCaseSensitive(instance),diff --git a/backend/component/export/resources.go b/backend/component/export/resources.goindex 7e46291658..02d5d78cb9 100644--- a/backend/component/export/resources.go+++ b/backend/component/export/resources.go@@ -59,12 +59,16 @@ func getResourcesForMySQL(listDatabaseNamesFunc base.ListDatabaseNamesFunc,getLinkedDatabaseMetadataFunc base.GetLinkedDatabaseMetadataFunc,) ([]base.SchemaResource, error) {+ statements, err := base.SplitMultiSQL(engine, statement)+ if err != nil {+ return nil, err+ }spans, err := base.GetQuerySpan(ctx, base.GetQuerySpanContext{InstanceID: instance.ResourceID,GetDatabaseMetadataFunc: getDatabaseMetadataFunc,ListDatabaseNamesFunc: listDatabaseNamesFunc,GetLinkedDatabaseMetadataFunc: getLinkedDatabaseMetadataFunc,- }, engine, statement, databaseName, "", !store.IsObjectCaseSensitive(instance))+ }, engine, statements, databaseName, "", !store.IsObjectCaseSensitive(instance))if err != nil {return nil, err} else if databaseName == "" {@@ -158,12 +162,16 @@ func getResourcesForPostgres(listDatabaseNamesFunc base.ListDatabaseNamesFunc,getLinkedDatabaseMetadataFunc base.GetLinkedDatabaseMetadataFunc,) ([]base.SchemaResource, error) {+ statements, err := base.SplitMultiSQL(engine, statement)+ if err != nil {+ return nil, err+ }spans, err := base.GetQuerySpan(ctx, base.GetQuerySpanContext{InstanceID: instance.ResourceID,GetDatabaseMetadataFunc: getDatabaseMetadataFunc,ListDatabaseNamesFunc: listDatabaseNamesFunc,GetLinkedDatabaseMetadataFunc: getLinkedDatabaseMetadataFunc,- }, engine, statement, databaseName, defaultSchema, !store.IsObjectCaseSensitive(instance))+ }, engine, statements, databaseName, defaultSchema, !store.IsObjectCaseSensitive(instance))if err != nil {return nil, err}@@ -224,12 +232,16 @@ func getResourcesForRedshift(listDatabaseNamesFunc base.ListDatabaseNamesFunc,getLinkedDatabaseMetadataFunc base.GetLinkedDatabaseMetadataFunc,) ([]base.SchemaResource, error) {+ statements, err := base.SplitMultiSQL(engine, statement)+ if err != nil {+ return nil, err+ }spans, err := base.GetQuerySpan(ctx, base.GetQuerySpanContext{InstanceID: instance.ResourceID,GetDatabaseMetadataFunc: getDatabaseMetadataFunc,ListDatabaseNamesFunc: listDatabaseNamesFunc,GetLinkedDatabaseMetadataFunc: getLinkedDatabaseMetadataFunc,- }, engine, statement, databaseName, defaultSchema, !store.IsObjectCaseSensitive(instance))+ }, engine, statements, databaseName, defaultSchema, !store.IsObjectCaseSensitive(instance))if err != nil {return nil, err}diff --git a/backend/plugin/parser/base/interface.go b/backend/plugin/parser/base/interface.goindex 9fc6215a2c..1a024f35d8 100644--- a/backend/plugin/parser/base/interface.go+++ b/backend/plugin/parser/base/interface.go@@ -61,8 +61,9 @@ type CompletionFunc func(ctx context.Context, cCtx CompletionContext, statementtype DiagnoseFunc func(ctx context.Context, dCtx DiagnoseContext, statement string) ([]Diagnostic, error)type StatementRangeFunc func(ctx context.Context, sCtx StatementRangeContext, statement string) ([]Range, error)-// GetQuerySpanFunc is the interface of getting the query span for a query.-type GetQuerySpanFunc func(ctx context.Context, gCtx GetQuerySpanContext, statement, database, schema string, ignoreCaseSensitive bool) (*QuerySpan, error)+// GetQuerySpanFunc is the interface of getting the query span for a single statement.+// It accepts a pre-split Statement instead of raw string to avoid redundant splitting.+type GetQuerySpanFunc func(ctx context.Context, gCtx GetQuerySpanContext, stmt Statement, database, schema string, ignoreCaseSensitive bool) (*QuerySpan, error)// TransformDMLToSelectFunc is the interface of transforming DML statements to SELECT statements.type TransformDMLToSelectFunc func(ctx context.Context, tCtx TransformContext, statement string, sourceDatabase string, targetDatabase string, tablePrefix string) ([]BackupStatement, error)@@ -202,27 +203,24 @@ func RegisterGetQuerySpan(engine storepb.Engine, f GetQuerySpanFunc) {spans[engine] = f}-// GetQuerySpan gets the span of a query.+// GetQuerySpan gets the span of a query from pre-split statements.// The interface will return the query spans with non-critical errors, or return an error if the query is invalid.-func GetQuerySpan(ctx context.Context, gCtx GetQuerySpanContext, engine storepb.Engine, statement, database, schema string, ignoreCaseSensitive bool) ([]*QuerySpan, error) {+// Callers should split the SQL first using SplitMultiSQL and pass the resulting []Statement.+func GetQuerySpan(ctx context.Context, gCtx GetQuerySpanContext, engine storepb.Engine, statements []Statement, database, schema string, ignoreCaseSensitive bool) ([]*QuerySpan, error) {f, ok := spans[engine]if !ok {return nil, nil}gCtx.Engine = engine- statements, err := SplitMultiSQL(engine, statement)- if err != nil {- return nil, err- }gCtx.TempTables = make(map[string]*PhysicalTable)var results []*QuerySpan- var nonEmptyStatement []string+ var nonEmptyStatements []Statementfor _, stmt := range statements {if stmt.Empty {continue}- nonEmptyStatement = append(nonEmptyStatement, stmt.Text)- result, err := f(ctx, gCtx, stmt.Text, database, schema, ignoreCaseSensitive)+ nonEmptyStatements = append(nonEmptyStatements, stmt)+ result, err := f(ctx, gCtx, stmt, database, schema, ignoreCaseSensitive)if err != nil {// Try to unwrap the error to see if it's a ResourceNotFoundError to decrease the error noise.// TODO(d): remove resource not found error checks.@@ -239,7 +237,7 @@ func GetQuerySpan(ctx context.Context, gCtx GetQuerySpanContext, engine storepb.results = append(results, result)}if engine == storepb.Engine_MSSQL {- TSQLRecognizeExplainType(results, nonEmptyStatement)+ tsqlRecognizeExplainType(results, nonEmptyStatements)}return results, nil}@@ -381,14 +379,14 @@ var (showplanReg = regexp.MustCompile(`(?mi)^\s*SET\s+SHOWPLAN_(ALL|XML|TEXT)\s+(?P<status>(ON|OFF))\s*;?$`))-// TSQLRecognizeExplainType walks the spans, and rewrite the select type to explain type if previous statement is SET SHOWPLAN_ALL.-func TSQLRecognizeExplainType(spans []*QuerySpan, stmt []string) {- if len(spans) != len(stmt) {+// tsqlRecognizeExplainType walks the spans, and rewrite the select type to explain type if previous statement is SET SHOWPLAN_ALL.+func tsqlRecognizeExplainType(spans []*QuerySpan, stmts []Statement) {+ if len(spans) != len(stmts) {return}on := falsefor i := range spans {- matches := showplanReg.FindStringSubmatch(stmt[i])+ matches := showplanReg.FindStringSubmatch(stmts[i].Text)if matches != nil {for k, name := range showplanReg.SubexpNames() {if k != 0 && name == "status" {diff --git a/backend/plugin/parser/base/interface_test.go b/backend/plugin/parser/base/interface_test.goindex 03ce811f45..1001937c76 100644--- a/backend/plugin/parser/base/interface_test.go+++ b/backend/plugin/parser/base/interface_test.go@@ -5,7 +5,7 @@ import "testing"func TestTSQLRecognizeExplainType(t *testing.T) {testCases := []struct {spans []*QuerySpan- stmts []string+ stmts []StatementwantSpans []*QuerySpan}{{@@ -26,12 +26,12 @@ func TestTSQLRecognizeExplainType(t *testing.T) {Type: Select,},},- stmts: []string{- "SELECT 1",- "SET SHOWPLAN_TEXT ON",- "SELECT 2",- "SET SHOWPLAN_TEXT OFF",- "SELECT 3",+ stmts: []Statement{+ {Text: "SELECT 1"},+ {Text: "SET SHOWPLAN_TEXT ON"},+ {Text: "SELECT 2"},+ {Text: "SET SHOWPLAN_TEXT OFF"},+ {Text: "SELECT 3"},},wantSpans: []*QuerySpan{{@@ -54,10 +54,10 @@ func TestTSQLRecognizeExplainType(t *testing.T) {}for _, tc := range testCases {- TSQLRecognizeExplainType(tc.spans, tc.stmts)+ tsqlRecognizeExplainType(tc.spans, tc.stmts)for i := range tc.spans {if tc.spans[i].Type != tc.wantSpans[i].Type {- t.Errorf("TSQLRecognizeExplainType() = %v, want %v", tc.spans[i].Type, tc.wantSpans[i].Type)+ t.Errorf("tsqlRecognizeExplainType() = %v, want %v", tc.spans[i].Type, tc.wantSpans[i].Type)}}}diff --git a/backend/plugin/parser/bigquery/query_span.go b/backend/plugin/parser/bigquery/query_span.goindex 4f049f81ee..43db3423c6 100644--- a/backend/plugin/parser/bigquery/query_span.go+++ b/backend/plugin/parser/bigquery/query_span.go@@ -15,13 +15,12 @@ func init() {func GetQuerySpan(ctx context.Context,gCtx base.GetQuerySpanContext,- statement, database, _ string,- // getDatabaseMetadata base.GetDatabaseMetadataFunc,- // listDatabaseFunc base.ListDatabaseNamesFunc,+ stmt base.Statement,+ database, _ string,ignoreCaseSensitive bool,) (*base.QuerySpan, error) {q := newQuerySpanExtractor(database, gCtx, ignoreCaseSensitive)- querySpan, err := q.getQuerySpan(ctx, statement)+ querySpan, err := q.getQuerySpan(ctx, stmt.Text)if err != nil {return nil, err}diff --git a/backend/plugin/parser/bigquery/query_span_test.go b/backend/plugin/parser/bigquery/query_span_test.goindex dabfe872be..49dee3afd5 100644--- a/backend/plugin/parser/bigquery/query_span_test.go+++ b/backend/plugin/parser/bigquery/query_span_test.go@@ -58,7 +58,7 @@ func TestGetQuerySpan(t *testing.T) {result, err := GetQuerySpan(context.TODO(), base.GetQuerySpanContext{GetDatabaseMetadataFunc: databaseMetadataGetter,ListDatabaseNamesFunc: databaseNameLister,- }, tc.Statement, tc.DefaultDatabase, "dbo", tc.IgnoreCaseSensitve)+ }, base.Statement{Text: tc.Statement}, tc.DefaultDatabase, "dbo", tc.IgnoreCaseSensitve)a.NoErrorf(err, "statement: %s", tc.Statement)resultYaml := result.ToYaml()if record {diff --git a/backend/plugin/parser/cassandra/query_span.go b/backend/plugin/parser/cassandra/query_span.goindex b4a46b3660..704cbaffc0 100644--- a/backend/plugin/parser/cassandra/query_span.go+++ b/backend/plugin/parser/cassandra/query_span.go@@ -15,8 +15,8 @@ func init() {}// GetQuerySpan extracts the query span from a CQL statement.-func GetQuerySpan(_ context.Context, gCtx base.GetQuerySpanContext, statement, database, _ string, _ bool) (*base.QuerySpan, error) {- parseResults, err := ParseCassandraSQL(statement)+func GetQuerySpan(_ context.Context, gCtx base.GetQuerySpanContext, stmt base.Statement, database, _ string, _ bool) (*base.QuerySpan, error) {+ parseResults, err := ParseCassandraSQL(stmt.Text)if err != nil {return nil, err}diff --git a/backend/plugin/parser/cassandra/query_span_test.go b/backend/plugin/parser/cassandra/query_span_test.goindex 5a9dff6081..96746e7c0b 100644--- a/backend/plugin/parser/cassandra/query_span_test.go+++ b/backend/plugin/parser/cassandra/query_span_test.go@@ -231,7 +231,7 @@ func TestGetQuerySpan(t *testing.T) {ctx := context.Background()gCtx := base.GetQuerySpanContext{}- got, err := GetQuerySpan(ctx, gCtx, tt.statement, "test_keyspace", "", false)+ got, err := GetQuerySpan(ctx, gCtx, base.Statement{Text: tt.statement}, "test_keyspace", "", false)require.NoError(t, err)require.NotNil(t, got)@@ -306,7 +306,7 @@ func TestGetQuerySpanWithErrors(t *testing.T) {ctx := context.Background()gCtx := base.GetQuerySpanContext{}- _, err := GetQuerySpan(ctx, gCtx, tt.statement, "test_keyspace", "", false)+ _, err := GetQuerySpan(ctx, gCtx, base.Statement{Text: tt.statement}, "test_keyspace", "", false)if tt.wantErr {require.Error(t, err)} else {@@ -398,7 +398,7 @@ func TestWhereColumnExtraction(t *testing.T) {ctx := context.Background()gCtx := base.GetQuerySpanContext{}- got, err := GetQuerySpan(ctx, gCtx, tt.statement, "test_keyspace", "", false)+ got, err := GetQuerySpan(ctx, gCtx, base.Statement{Text: tt.statement}, "test_keyspace", "", false)require.NoError(t, err)require.NotNil(t, got)@@ -478,7 +478,7 @@ func TestSourceColumnsTableResources(t *testing.T) {ctx := context.Background()gCtx := base.GetQuerySpanContext{}- got, err := GetQuerySpan(ctx, gCtx, tt.statement, "test_keyspace", "", false)+ got, err := GetQuerySpan(ctx, gCtx, base.Statement{Text: tt.statement}, "test_keyspace", "", false)require.NoError(t, err)require.NotNil(t, got)@@ -627,7 +627,7 @@ func TestQueryTypeDetection(t *testing.T) {ctx := context.Background()gCtx := base.GetQuerySpanContext{}- got, err := GetQuerySpan(ctx, gCtx, tt.statement, "test_keyspace", "", false)+ got, err := GetQuerySpan(ctx, gCtx, base.Statement{Text: tt.statement}, "test_keyspace", "", false)require.NoError(t, err)require.NotNil(t, got)require.Equal(t, tt.expectedType, got.Type, "Query type mismatch for %s", tt.statement)@@ -657,7 +657,7 @@ func TestSelectAsteriskWithMetadata(t *testing.T) {// Note: tt.hasMetadata would be used to set up mock metadata function// For now, we're testing the fallback behavior without metadata- got, err := GetQuerySpan(ctx, gCtx, tt.statement, "test_keyspace", "", false)+ got, err := GetQuerySpan(ctx, gCtx, base.Statement{Text: tt.statement}, "test_keyspace", "", false)require.NoError(t, err)require.NotNil(t, got)diff --git a/backend/plugin/parser/cosmosdb/query_span.go b/backend/plugin/parser/cosmosdb/query_span.goindex 0005cc0cb5..b392370cb9 100644--- a/backend/plugin/parser/cosmosdb/query_span.go+++ b/backend/plugin/parser/cosmosdb/query_span.go@@ -17,8 +17,8 @@ func init() {base.RegisterGetQuerySpan(storepb.Engine_COSMOSDB, GetQuerySpan)}-func GetQuerySpan(_ context.Context, _ base.GetQuerySpanContext, statement, _, _ string, _ bool) (*base.QuerySpan, error) {- return getQuerySpanImpl(statement)+func GetQuerySpan(_ context.Context, _ base.GetQuerySpanContext, stmt base.Statement, _, _ string, _ bool) (*base.QuerySpan, error) {+ return getQuerySpanImpl(stmt.Text)}func getQuerySpanImpl(statement string) (*base.QuerySpan, error) {diff --git a/backend/plugin/parser/cosmosdb/query_span_test.go b/backend/plugin/parser/cosmosdb/query_span_test.goindex 48a8bf679a..6f8981876b 100644--- a/backend/plugin/parser/cosmosdb/query_span_test.go+++ b/backend/plugin/parser/cosmosdb/query_span_test.go@@ -40,7 +40,7 @@ func TestGetQuerySpan(t *testing.T) {a.NoError(yaml.Unmarshal(byteValue, &testCases))for i, tc := range testCases {- result, err := GetQuerySpan(context.TODO(), base.GetQuerySpanContext{}, tc.Statement, "", "", false)+ result, err := GetQuerySpan(context.TODO(), base.GetQuerySpanContext{}, base.Statement{Text: tc.Statement}, "", "", false)a.NoErrorf(err, "statement: %s", tc.Statement)resultYaml := result.ToYaml()if record {diff --git a/backend/plugin/parser/doris/query_span.go b/backend/plugin/parser/doris/query_span.goindex 988288139b..2ee32c4210 100644--- a/backend/plugin/parser/doris/query_span.go+++ b/backend/plugin/parser/doris/query_span.go@@ -15,11 +15,12 @@ func init() {func GetQuerySpan(ctx context.Context,gCtx base.GetQuerySpanContext,- statement, database, _ string,+ stmt base.Statement,+ database, _ string,ignoreCaseSensitive bool,) (*base.QuerySpan, error) {q := newQuerySpanExtractor(database, gCtx, ignoreCaseSensitive)- querySpan, err := q.getQuerySpan(ctx, statement)+ querySpan, err := q.getQuerySpan(ctx, stmt.Text)if err != nil {return nil, err}diff --git a/backend/plugin/parser/doris/query_span_extractor_system_table_test.go b/backend/plugin/parser/doris/query_span_extractor_system_table_test.goindex fc77259844..53fdc1542c 100644--- a/backend/plugin/parser/doris/query_span_extractor_system_table_test.go+++ b/backend/plugin/parser/doris/query_span_extractor_system_table_test.go@@ -53,7 +53,7 @@ func TestGetQuerySpan_SystemTable(t *testing.T) {result, err := GetQuerySpan(context.TODO(), base.GetQuerySpanContext{GetDatabaseMetadataFunc: databaseMetadataGetter,ListDatabaseNamesFunc: databaseNameLister,- }, tc.Statement, tc.DefaultDatabase, "", false)+ }, base.Statement{Text: tc.Statement}, tc.DefaultDatabase, "", false)a.NoErrorf(err, "statement: %s", tc.Statement)resultYaml := result.ToYaml()if record {diff --git a/backend/plugin/parser/mysql/completion.go b/backend/plugin/parser/mysql/completion.goindex d76f3a1fc3..3cbe7f1391 100644--- a/backend/plugin/parser/mysql/completion.go+++ b/backend/plugin/parser/mysql/completion.go@@ -671,7 +671,7 @@ func (l *CTETableListener) EnterCommonTableExpression(ctx *mysql.CommonTableExprGetDatabaseMetadataFunc: l.context.getMetadata,ListDatabaseNamesFunc: l.context.listDatabaseNames,},- fmt.Sprintf("SELECT * FROM %s;", ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx.Subquery())),+ base.Statement{Text: fmt.Sprintf("SELECT * FROM %s;", ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx.Subquery()))},l.context.defaultDatabase,"",false,@@ -1147,7 +1147,7 @@ func (l *TableRefListener) EnterDerivedTable(ctx *mysql.DerivedTableContext) {GetDatabaseMetadataFunc: l.context.getMetadata,ListDatabaseNamesFunc: l.context.listDatabaseNames,},- fmt.Sprintf("SELECT * FROM %s;", ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx.Subquery())),+ base.Statement{Text: fmt.Sprintf("SELECT * FROM %s;", ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx.Subquery()))},l.context.defaultDatabase,"",false,diff --git a/backend/plugin/parser/mysql/query_span.go b/backend/plugin/parser/mysql/query_span.goindex c53686855a..666bf63b05 100644--- a/backend/plugin/parser/mysql/query_span.go+++ b/backend/plugin/parser/mysql/query_span.go@@ -17,13 +17,12 @@ func init() {func GetQuerySpan(ctx context.Context,gCtx base.GetQuerySpanContext,- statement, database, _ string,- // getDatabaseMetadata base.GetDatabaseMetadataFunc,- // listDatabaseFunc base.ListDatabaseNamesFunc,+ stmt base.Statement,+ database, _ string,ignoreCaseSensitive bool,) (*base.QuerySpan, error) {q := newQuerySpanExtractor(database, gCtx, ignoreCaseSensitive)- querySpan, err := q.getQuerySpan(ctx, statement)+ querySpan, err := q.getQuerySpan(ctx, stmt.Text)if err != nil {return nil, err}diff --git a/backend/plugin/parser/mysql/query_span_test.go b/backend/plugin/parser/mysql/query_span_test.goindex 893c5f7b10..bd13167e23 100644--- a/backend/plugin/parser/mysql/query_span_test.go+++ b/backend/plugin/parser/mysql/query_span_test.go@@ -66,7 +66,7 @@ func TestGetQuerySpan(t *testing.T) {GetDatabaseMetadataFunc: databaseMetadataGetter,ListDatabaseNamesFunc: databaseNameLister,Engine: engine,- }, tc.Statement, tc.DefaultDatabase, "", tc.IgnoreCaseSensitve)+ }, base.Statement{Text: tc.Statement}, tc.DefaultDatabase, "", tc.IgnoreCaseSensitve)a.NoErrorf(err, "statement: %s", tc.Statement)resultYaml := result.ToYaml()if record {diff --git a/backend/plugin/parser/pg/completion.go b/backend/plugin/parser/pg/completion.goindex c57a7296ce..9c9daa95d9 100644--- a/backend/plugin/parser/pg/completion.go+++ b/backend/plugin/parser/pg/completion.go@@ -800,7 +800,7 @@ func (l *CTETableListener) EnterCommon_table_expr(ctx *pg.Common_table_exprConteGetDatabaseMetadataFunc: l.context.getMetadata,ListDatabaseNamesFunc: l.context.listDatabaseNames,},- ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx.Preparablestmt()),+ base.Statement{Text: ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx.Preparablestmt())},l.context.defaultDatabase,"",false,@@ -1177,7 +1177,7 @@ func (l *TableRefListener) EnterTable_ref(ctx *pg.Table_refContext) {GetDatabaseMetadataFunc: l.context.getMetadata,ListDatabaseNamesFunc: l.context.listDatabaseNames,},- fmt.Sprintf("SELECT * FROM %s AS %s;", ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx.Select_with_parens()), tableAlias),+ base.Statement{Text: fmt.Sprintf("SELECT * FROM %s AS %s;", ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx.Select_with_parens()), tableAlias)},l.context.defaultDatabase,"",false,diff --git a/backend/plugin/parser/pg/query_span.go b/backend/plugin/parser/pg/query_span.goindex c0ca78af9a..7be22bd7a6 100644--- a/backend/plugin/parser/pg/query_span.go+++ b/backend/plugin/parser/pg/query_span.go@@ -15,7 +15,7 @@ func init() {}// GetQuerySpan returns the query span for the given statement.-func GetQuerySpan(ctx context.Context, gCtx base.GetQuerySpanContext, statement, database, schema string, _ bool) (*base.QuerySpan, error) {+func GetQuerySpan(ctx context.Context, gCtx base.GetQuerySpanContext, stmt base.Statement, database, schema string, _ bool) (*base.QuerySpan, error) {if gCtx.GetDatabaseMetadataFunc == nil {return nil, errors.New("GetDatabaseMetadataFunc is not set in GetQuerySpanContext")}@@ -30,9 +30,9 @@ func GetQuerySpan(ctx context.Context, gCtx base.GetQuerySpanContext, statement,extractor := newQuerySpanExtractor(database, searchPath, gCtx)// Use the new ANTLR-based implementation- querySpan, err := extractor.getQuerySpan(ctx, statement)+ querySpan, err := extractor.getQuerySpan(ctx, stmt.Text)if err != nil {- return nil, errors.Wrapf(err, "failed to get query span from statement: %s", statement)+ return nil, errors.Wrapf(err, "failed to get query span from statement: %s", stmt.Text)}return querySpan, nil}diff --git a/backend/plugin/parser/pg/query_span_test.go b/backend/plugin/parser/pg/query_span_test.goindex e08047b629..3d72e82f71 100644--- a/backend/plugin/parser/pg/query_span_test.go+++ b/backend/plugin/parser/pg/query_span_test.go@@ -53,7 +53,7 @@ func TestGetQuerySpan(t *testing.T) {result, err := GetQuerySpan(context.TODO(), base.GetQuerySpanContext{GetDatabaseMetadataFunc: databaseMetadataGetter,ListDatabaseNamesFunc: databaseNameLister,- }, tc.Statement, tc.DefaultDatabase, "", false)+ }, base.Statement{Text: tc.Statement}, tc.DefaultDatabase, "", false)a.NoErrorf(err, "idx: %d statement: %s", i, tc.Statement)resultYaml := result.ToYaml()if record {diff --git a/backend/plugin/parser/plsql/completion.go b/backend/plugin/parser/plsql/completion.goindex 96bc115eb1..03938d46ee 100644--- a/backend/plugin/parser/plsql/completion.go+++ b/backend/plugin/parser/plsql/completion.go@@ -751,7 +751,7 @@ func (l *CTETableListener) EnterFactoring_element(ctx *plsql.Factoring_elementCoGetDatabaseMetadataFunc: l.context.getMetadata,ListDatabaseNamesFunc: l.context.listDatabaseNames,},- fmt.Sprintf("SELECT * FROM (%s)", ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx.Subquery())),+ base.Statement{Text: fmt.Sprintf("SELECT * FROM (%s)", ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx.Subquery()))},l.context.defaultDatabase,"",false,@@ -1075,7 +1075,7 @@ func (l *TableRefListener) ExitDml_table_expression_clause(ctx *plsql.Dml_table_GetDatabaseMetadataFunc: l.context.getMetadata,ListDatabaseNamesFunc: l.context.listDatabaseNames,},- ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx.Select_statement()),+ base.Statement{Text: ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx.Select_statement())},l.context.defaultDatabase,"",false,diff --git a/backend/plugin/parser/plsql/query_span.go b/backend/plugin/parser/plsql/query_span.goindex 18cb026ba5..7889e70d11 100644--- a/backend/plugin/parser/plsql/query_span.go+++ b/backend/plugin/parser/plsql/query_span.go@@ -13,12 +13,12 @@ func init() {base.RegisterGetQuerySpan(storepb.Engine_ORACLE, GetQuerySpan)}-func GetQuerySpan(ctx context.Context, gCtx base.GetQuerySpanContext, statement, database, _ string, _ bool) (*base.QuerySpan, error) {+func GetQuerySpan(ctx context.Context, gCtx base.GetQuerySpanContext, stmt base.Statement, database, _ string, _ bool) (*base.QuerySpan, error) {extractor := newQuerySpanExtractor(database, gCtx)- querySpan, err := extractor.getQuerySpan(ctx, statement)+ querySpan, err := extractor.getQuerySpan(ctx, stmt.Text)if err != nil {- return nil, errors.Wrapf(err, "failed to get query span from statement: %s", statement)+ return nil, errors.Wrapf(err, "failed to get query span from statement: %s", stmt.Text)}return querySpan, nil}diff --git a/backend/plugin/parser/plsql/query_span_test.go b/backend/plugin/parser/plsql/query_span_test.goindex 3542ac464d..faaa3bfee3 100644--- a/backend/plugin/parser/plsql/query_span_test.go+++ b/backend/plugin/parser/plsql/query_span_test.go@@ -63,7 +63,7 @@ func TestGetQuerySpan(t *testing.T) {GetDatabaseMetadataFunc: databaseMetadataGetter,ListDatabaseNamesFunc: databaseNamesLister,GetLinkedDatabaseMetadataFunc: linkedDatabaseMetadataGetter,- }, tc.Statement, tc.DefaultDatabase, "", false)+ }, base.Statement{Text: tc.Statement}, tc.DefaultDatabase, "", false)a.NoError(err)a.NotNil(result)resultYaml := result.ToYaml()diff --git a/backend/plugin/parser/redshift/completion.go b/backend/plugin/parser/redshift/completion.goindex e40f18921c..2b1e6d1939 100644--- a/backend/plugin/parser/redshift/completion.go+++ b/backend/plugin/parser/redshift/completion.go@@ -793,7 +793,7 @@ func (l *CTETableListener) EnterCommon_table_expr(ctx *parser.Common_table_exprCGetDatabaseMetadataFunc: l.context.getMetadata,ListDatabaseNamesFunc: l.context.listDatabaseNames,},- ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx.Preparablestmt()),+ base.Statement{Text: ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx.Preparablestmt())},l.context.defaultDatabase,"",false,@@ -1169,7 +1169,7 @@ func (l *TableRefListener) EnterTable_ref(ctx *parser.Table_refContext) {GetDatabaseMetadataFunc: l.context.getMetadata,ListDatabaseNamesFunc: l.context.listDatabaseNames,},- fmt.Sprintf("SELECT * FROM %s AS %s;", ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx.Select_with_parens()), tableAlias),+ base.Statement{Text: fmt.Sprintf("SELECT * FROM %s AS %s;", ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx.Select_with_parens()), tableAlias)},l.context.defaultDatabase,"",false,diff --git a/backend/plugin/parser/redshift/query_span.go b/backend/plugin/parser/redshift/query_span.goindex 0fd0c6d636..740ccc8cc4 100644--- a/backend/plugin/parser/redshift/query_span.go+++ b/backend/plugin/parser/redshift/query_span.go@@ -14,7 +14,7 @@ func init() {}// GetQuerySpan returns the query span for the given statement.-func GetQuerySpan(ctx context.Context, gCtx base.GetQuerySpanContext, statement, database, schema string, _ bool) (*base.QuerySpan, error) {+func GetQuerySpan(ctx context.Context, gCtx base.GetQuerySpanContext, stmt base.Statement, database, schema string, _ bool) (*base.QuerySpan, error) {if gCtx.GetDatabaseMetadataFunc == nil {return nil, errors.New("GetDatabaseMetadataFunc is not set in GetQuerySpanContext")}@@ -29,9 +29,9 @@ func GetQuerySpan(ctx context.Context, gCtx base.GetQuerySpanContext, statement,extractor := newQuerySpanExtractor(database, searchPath, gCtx)// Use the new ANTLR-based implementation- querySpan, err := extractor.getQuerySpan(ctx, statement)+ querySpan, err := extractor.getQuerySpan(ctx, stmt.Text)if err != nil {- return nil, errors.Wrapf(err, "failed to get query span from statement: %s", statement)+ return nil, errors.Wrapf(err, "failed to get query span from statement: %s", stmt.Text)}return querySpan, nil}diff --git a/backend/plugin/parser/snowflake/query_span.go b/backend/plugin/parser/snowflake/query_span.goindex 277e0abcf8..d668e9bf63 100644--- a/backend/plugin/parser/snowflake/query_span.go+++ b/backend/plugin/parser/snowflake/query_span.go@@ -15,11 +15,12 @@ func init() {func GetQuerySpan(ctx context.Context,gCtx base.GetQuerySpanContext,- statement, database, schema string,+ stmt base.Statement,+ database, schema string,ignoreCaseSensitive bool,) (*base.QuerySpan, error) {q := newQuerySpanExtractor(database, schema, gCtx, ignoreCaseSensitive)- querySpan, err := q.getQuerySpan(ctx, statement)+ querySpan, err := q.getQuerySpan(ctx, stmt.Text)if err != nil {return nil, err}diff --git a/backend/plugin/parser/snowflake/query_span_test.go b/backend/plugin/parser/snowflake/query_span_test.goindex a0279cee9a..de037d34f4 100644--- a/backend/plugin/parser/snowflake/query_span_test.go+++ b/backend/plugin/parser/snowflake/query_span_test.go@@ -59,7 +59,7 @@ func TestGetQuerySpan(t *testing.T) {result, err := GetQuerySpan(context.TODO(), base.GetQuerySpanContext{GetDatabaseMetadataFunc: databaseMetadataGetter,ListDatabaseNamesFunc: databaseNameLister,- }, tc.Statement, tc.DefaultDatabase, "PUBLIC", tc.IgnoreCaseSensitve)+ }, base.Statement{Text: tc.Statement}, tc.DefaultDatabase, "PUBLIC", tc.IgnoreCaseSensitve)a.NoErrorf(err, "statement: %s", tc.Statement)resultYaml := result.ToYaml()if record {diff --git a/backend/plugin/parser/spanner/query_span.go b/backend/plugin/parser/spanner/query_span.goindex 9036477e49..e38fa96727 100644--- a/backend/plugin/parser/spanner/query_span.go+++ b/backend/plugin/parser/spanner/query_span.go@@ -15,13 +15,12 @@ func init() {func GetQuerySpan(ctx context.Context,gCtx base.GetQuerySpanContext,- statement, database, _ string,- // getDatabaseMetadata base.GetDatabaseMetadataFunc,- // listDatabaseFunc base.ListDatabaseNamesFunc,+ stmt base.Statement,+ database, _ string,ignoreCaseSensitive bool,) (*base.QuerySpan, error) {q := newQuerySpanExtractor(database, gCtx, ignoreCaseSensitive)- querySpan, err := q.getQuerySpan(ctx, statement)+ querySpan, err := q.getQuerySpan(ctx, stmt.Text)if err != nil {return nil, err}diff --git a/backend/plugin/parser/spanner/query_span_test.go b/backend/plugin/parser/spanner/query_span_test.goindex ea5d23ef01..2cd94ac91e 100644--- a/backend/plugin/parser/spanner/query_span_test.go+++ b/backend/plugin/parser/spanner/query_span_test.go@@ -58,7 +58,7 @@ func TestGetQuerySpan(t *testing.T) {result, err := GetQuerySpan(context.TODO(), base.GetQuerySpanContext{GetDatabaseMetadataFunc: databaseMetadataGetter,ListDatabaseNamesFunc: databaseNameLister,- }, tc.Statement, tc.DefaultDatabase, "dbo", tc.IgnoreCaseSensitve)+ }, base.Statement{Text: tc.Statement}, tc.DefaultDatabase, "dbo", tc.IgnoreCaseSensitve)a.NoErrorf(err, "statement: %s", tc.Statement)resultYaml := result.ToYaml()if record {diff --git a/backend/plugin/parser/tidb/query_span.go b/backend/plugin/parser/tidb/query_span.goindex 5daf245db3..a89bae287e 100644--- a/backend/plugin/parser/tidb/query_span.go+++ b/backend/plugin/parser/tidb/query_span.go@@ -13,12 +13,12 @@ func init() {base.RegisterGetQuerySpan(storepb.Engine_TIDB, GetQuerySpan)}-func GetQuerySpan(ctx context.Context, gCtx base.GetQuerySpanContext, statement, database, _ string, _ bool) (*base.QuerySpan, error) {+func GetQuerySpan(ctx context.Context, gCtx base.GetQuerySpanContext, stmt base.Statement, database, _ string, _ bool) (*base.QuerySpan, error) {extractor := newQuerySpanExtractor(database, gCtx)- querySpan, err := extractor.getQuerySpan(ctx, statement)+ querySpan, err := extractor.getQuerySpan(ctx, stmt.Text)if err != nil {- return nil, errors.Wrapf(err, "failed to get query span from statement: %s", statement)+ return nil, errors.Wrapf(err, "failed to get query span from statement: %s", stmt.Text)}return querySpan, nil}diff --git a/backend/plugin/parser/tidb/query_span_test.go b/backend/plugin/parser/tidb/query_span_test.goindex 356f98c52b..d87696d4b7 100644--- a/backend/plugin/parser/tidb/query_span_test.go+++ b/backend/plugin/parser/tidb/query_span_test.go@@ -57,7 +57,7 @@ func TestGetQuerySpan(t *testing.T) {result, err := GetQuerySpan(context.TODO(), base.GetQuerySpanContext{GetDatabaseMetadataFunc: databaseMetadataGetter,ListDatabaseNamesFunc: databaseNamesLister,- }, tc.Statement, tc.DefaultDatabase, "", false)+ }, base.Statement{Text: tc.Statement}, tc.DefaultDatabase, "", false)a.NoError(err)resultYaml := result.ToYaml()if record {diff --git a/backend/plugin/parser/trino/completion.go b/backend/plugin/parser/trino/completion.goindex 021ec58b3e..8a3fb987e4 100644--- a/backend/plugin/parser/trino/completion.go+++ b/backend/plugin/parser/trino/completion.go@@ -1399,7 +1399,7 @@ func (l *tableRefListener) ExitSubquery(ctx *trinoparser.SubqueryContext) {GetDatabaseMetadataFunc: l.context.metadataGetter,ListDatabaseNamesFunc: l.context.catalogNamesLister,},- fmt.Sprintf("SELECT * FROM (%s);", ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx)),+ base.Statement{Text: fmt.Sprintf("SELECT * FROM (%s);", ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx))},l.context.defaultCatalog,l.context.defaultSchema,true,@@ -1501,7 +1501,7 @@ func (c *cteExtractor) EnterWith(ctx *trinoparser.WithContext) {GetDatabaseMetadataFunc: c.completer.metadataGetter,ListDatabaseNamesFunc: c.completer.catalogNamesLister,},- statement,+ base.Statement{Text: statement},c.completer.defaultCatalog,c.completer.defaultSchema,true,diff --git a/backend/plugin/parser/trino/parser_test.go b/backend/plugin/parser/trino/parser_test.goindex f9e45233aa..9533956925 100644--- a/backend/plugin/parser/trino/parser_test.go+++ b/backend/plugin/parser/trino/parser_test.go@@ -181,7 +181,7 @@ func TestGetQuerySpan(t *testing.T) {// Special handling for non-SELECT queries that will skip metadata lookupif tc.wantType != base.Select && tc.wantType != base.Explain && tc.wantType != base.SelectInfoSchema {- span, err := GetQuerySpan(context.Background(), gCtx, tc.sql, tc.database, tc.schema, true)+ span, err := GetQuerySpan(context.Background(), gCtx, base.Statement{Text: tc.sql}, tc.database, tc.schema, true)if assert.NoError(t, err) {assert.Equal(t, tc.wantType, span.Type)assert.Empty(t, span.Results, "Results should be empty for non-SELECT queries")@@ -190,7 +190,7 @@ func TestGetQuerySpan(t *testing.T) {}// For SELECT queries, we expect a basic query span with the correct type- span, err := GetQuerySpan(context.Background(), gCtx, tc.sql, tc.database, tc.schema, true)+ span, err := GetQuerySpan(context.Background(), gCtx, base.Statement{Text: tc.sql}, tc.database, tc.schema, true)if assert.NoError(t, err) {assert.Equal(t, tc.wantType, span.Type)}diff --git a/backend/plugin/parser/trino/query_span.go b/backend/plugin/parser/trino/query_span.goindex abe8741c9f..bfc21b7b8a 100644--- a/backend/plugin/parser/trino/query_span.go+++ b/backend/plugin/parser/trino/query_span.go@@ -15,12 +15,12 @@ func init() {// GetQuerySpan gets the query span for Trino.// This is the entry point registered with the base package.-func GetQuerySpan(ctx context.Context, gCtx base.GetQuerySpanContext, statement, database, schema string, ignoreCaseSensitive bool) (*base.QuerySpan, error) {+func GetQuerySpan(ctx context.Context, gCtx base.GetQuerySpanContext, stmt base.Statement, database, schema string, ignoreCaseSensitive bool) (*base.QuerySpan, error) {extractor := newQuerySpanExtractor(database, schema, gCtx, ignoreCaseSensitive)- querySpan, err := extractor.getQuerySpan(ctx, statement)+ querySpan, err := extractor.getQuerySpan(ctx, stmt.Text)if err != nil {- return nil, errors.Wrapf(err, "failed to get query span from statement: %s", statement)+ return nil, errors.Wrapf(err, "failed to get query span from statement: %s", stmt.Text)}return querySpan, nildiff --git a/backend/plugin/parser/trino/query_span_test.go b/backend/plugin/parser/trino/query_span_test.goindex fe51e23ca4..c647e64a7c 100644--- a/backend/plugin/parser/trino/query_span_test.go+++ b/backend/plugin/parser/trino/query_span_test.go@@ -156,7 +156,7 @@ func TestGetQuerySpanFromYAML(t *testing.T) {GetDatabaseMetadataFunc: databaseMetadataGetter,ListDatabaseNamesFunc: databaseNameLister,Engine: storepb.Engine_TRINO,- }, tc.Statement, tc.DefaultDatabase, "", tc.IgnoreCaseSensitve)+ }, base.Statement{Text: tc.Statement}, tc.DefaultDatabase, "", tc.IgnoreCaseSensitve)a.NoErrorf(err, "statement: %s", tc.Statement)// Verify the query type is correctdiff --git a/backend/plugin/parser/tsql/completion.go b/backend/plugin/parser/tsql/completion.goindex 5cdc2d5be6..f96609da59 100644--- a/backend/plugin/parser/tsql/completion.go+++ b/backend/plugin/parser/tsql/completion.go@@ -1558,7 +1558,7 @@ func (l *tableRefListener) ExitDerivedTable(ctx *tsqlparser.Derived_tableContextGetDatabaseMetadataFunc: l.context.metadataGetter,ListDatabaseNamesFunc: l.context.databaseNamesLister,},- fmt.Sprintf("SELECT * FROM (%s);", ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx)),+ base.Statement{Text: fmt.Sprintf("SELECT * FROM (%s);", ctx.GetParser().GetTokenStream().GetTextFromRuleContext(ctx))},l.context.defaultDatabase,l.context.defaultSchema,true,@@ -1703,7 +1703,7 @@ func (c *cteExtractor) EnterWith_expression(ctx *tsqlparser.With_expressionConteGetDatabaseMetadataFunc: c.completer.metadataGetter,ListDatabaseNamesFunc: c.completer.databaseNamesLister,},- statement,+ base.Statement{Text: statement},c.completer.defaultDatabase,c.completer.defaultSchema,true,diff --git a/backend/plugin/parser/tsql/query_span.go b/backend/plugin/parser/tsql/query_span.goindex ce1109182f..633ec70f4f 100644--- a/backend/plugin/parser/tsql/query_span.go+++ b/backend/plugin/parser/tsql/query_span.go@@ -15,11 +15,12 @@ func init() {func GetQuerySpan(ctx context.Context,gCtx base.GetQuerySpanContext,- statement, database, schema string,+ stmt base.Statement,+ database, schema string,ignoreCaseSensitive bool,) (*base.QuerySpan, error) {q := newQuerySpanExtractor(database, schema, gCtx, ignoreCaseSensitive)- querySpan, err := q.getQuerySpan(ctx, statement)+ querySpan, err := q.getQuerySpan(ctx, stmt.Text)if err != nil {return nil, err}diff --git a/backend/plugin/parser/tsql/query_span_test.go b/backend/plugin/parser/tsql/query_span_test.goindex df291ba8dc..179c525141 100644--- a/backend/plugin/parser/tsql/query_span_test.go+++ b/backend/plugin/parser/tsql/query_span_test.go@@ -63,7 +63,7 @@ func TestGetQuerySpan(t *testing.T) {GetDatabaseMetadataFunc: databaseMetadataGetter,ListDatabaseNamesFunc: databaseNameLister,TempTables: make(map[string]*base.PhysicalTable),- }, tc.Statement, tc.DefaultDatabase, "dbo", tc.IgnoreCaseSensitve)+ }, base.Statement{Text: tc.Statement}, tc.DefaultDatabase, "dbo", tc.IgnoreCaseSensitve)a.NoErrorf(err, "statement: %s", tc.Statement)resultYaml := result.ToYaml()if record {diff --git a/backend/plugin/schema/mssql/generate_migration.go b/backend/plugin/schema/mssql/generate_migration.goindex 1b26f74207..83e10aec71 100644--- a/backend/plugin/schema/mssql/generate_migration.go+++ b/backend/plugin/schema/mssql/generate_migration.go@@ -1123,7 +1123,7 @@ func getViewDependencies(viewDef string, schemaName string) ([]string, error) {return []string{}, nil},},- l.result,+ base.Statement{Text: l.result},"", // databaseschemaName,false, // case sensitivediff --git a/backend/plugin/schema/pg/get_database_metadata.go b/backend/plugin/schema/pg/get_database_metadata.goindex fe0f22c7c3..7c4f43a5bd 100644--- a/backend/plugin/schema/pg/get_database_metadata.go+++ b/backend/plugin/schema/pg/get_database_metadata.go@@ -2863,7 +2863,7 @@ func getViewDependencies(viewDef string, schemaName string, fullSchemaMetadata *return []string{}, nil},},- queryStatement,+ base.Statement{Text: queryStatement},"", // databaseschemaName,false, // case sensitive