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): migrate Doris parser to new Apache Doris grammar (#18251)
h3n4l6479ef73e732
diff --git a/backend/plugin/parser/doris/diagnose.go b/backend/plugin/parser/doris/diagnose.goindex caf2ed6c13..0eba756c75 100644--- a/backend/plugin/parser/doris/diagnose.go+++ b/backend/plugin/parser/doris/diagnose.go@@ -26,9 +26,9 @@ func Diagnose(_ context.Context, _ base.DiagnoseContext, statement string) ([]ba}func parseDorisStatement(statement string) *base.SyntaxError {- lexer := parser.NewDorisSQLLexer(antlr.NewInputStream(statement))+ lexer := parser.NewDorisLexer(antlr.NewInputStream(statement))stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)- p := parser.NewDorisSQLParser(stream)+ p := parser.NewDorisParser(stream)lexerErrorListener := &base.ParseErrorListener{Statement: statement,}@@ -43,7 +43,7 @@ func parseDorisStatement(statement string) *base.SyntaxError {p.BuildParseTrees = false- _ = p.SqlStatements()+ _ = p.MultiStatements()if lexerErrorListener.Err != nil {return lexerErrorListener.Err}diff --git a/backend/plugin/parser/doris/doris.go b/backend/plugin/parser/doris/doris.goindex 8d0051326c..db5cfa93ed 100644--- a/backend/plugin/parser/doris/doris.go+++ b/backend/plugin/parser/doris/doris.go@@ -59,9 +59,9 @@ func ParseDorisSQL(statement string) ([]*base.ParseResult, error) {}func parseSingleDorisSQL(statement string, baseLine int) (*base.ParseResult, error) {- lexer := parser.NewDorisSQLLexer(antlr.NewInputStream(statement))+ lexer := parser.NewDorisLexer(antlr.NewInputStream(statement))stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)- p := parser.NewDorisSQLParser(stream)+ p := parser.NewDorisParser(stream)startPosition := &storepb.Position{Line: int32(baseLine) + 1}lexerErrorListener := &base.ParseErrorListener{Statement: statement,@@ -79,7 +79,7 @@ func parseSingleDorisSQL(statement string, baseLine int) (*base.ParseResult, errp.BuildParseTrees = true- tree := p.SqlStatements()+ tree := p.MultiStatements()if lexerErrorListener.Err != nil {return nil, lexerErrorListener.Err}diff --git a/backend/plugin/parser/doris/doris_test.go b/backend/plugin/parser/doris/doris_test.goindex 6bd7d92267..4bb75acc07 100644--- a/backend/plugin/parser/doris/doris_test.go+++ b/backend/plugin/parser/doris/doris_test.go@@ -27,7 +27,7 @@ func TestDorisSQLParser(t *testing.T) {for _, test := range tests {res, err := ParseDorisSQL(test.statement)if len(res) > 0 {- _, ok := res[0].Tree.(*parser.SqlStatementsContext)+ _, ok := res[0].Tree.(*parser.MultiStatementsContext)require.True(t, ok)}if test.errorMessage == "" {diff --git a/backend/plugin/parser/doris/normalize.go b/backend/plugin/parser/doris/normalize.goindex 8de15c0284..d1fd016a89 100644--- a/backend/plugin/parser/doris/normalize.go+++ b/backend/plugin/parser/doris/normalize.go@@ -1,13 +1,22 @@package doris-import parser "github.com/bytebase/parser/doris"+import (+ "strings"-func NormalizeQualifiedName(ctx parser.IQualifiedNameContext) []string {+ parser "github.com/bytebase/parser/doris"+)++// NormalizeMultipartIdentifier extracts parts from a MultipartIdentifierContext.+func NormalizeMultipartIdentifier(ctx parser.IMultipartIdentifierContext) []string {if ctx == nil {return nil}var result []string- for _, id := range ctx.AllIdentifier() {+ for _, part := range ctx.AllErrorCapturingIdentifier() {+ if part == nil {+ continue+ }+ id := part.Identifier()if id == nil {continue}@@ -16,19 +25,18 @@ func NormalizeQualifiedName(ctx parser.IQualifiedNameContext) []string {return result}+// NormalizeIdentifier extracts the identifier text from an IdentifierContext.+// It removes backticks from quoted identifiers.func NormalizeIdentifier(ctx parser.IIdentifierContext) string {if ctx == nil {return ""}- switch ctx.(type) {- case *parser.UnquotedIdentifierContext:- return ctx.GetText()- case *parser.DigitIdentifierContext:- return ctx.GetText()- case *parser.BackQuotedIdentifierContext:- return ctx.GetText()[1 : len(ctx.GetText())-1]+ text := ctx.GetText()+ // Check if it's a backtick-quoted identifier and remove the backticks+ if strings.HasPrefix(text, "`") && strings.HasSuffix(text, "`") && len(text) >= 2 {+ return text[1 : len(text)-1]}- return ctx.GetText()+ return text}diff --git a/backend/plugin/parser/doris/query.go b/backend/plugin/parser/doris/query.goindex f43b7c7607..1a7c41b1b3 100644--- a/backend/plugin/parser/doris/query.go+++ b/backend/plugin/parser/doris/query.go@@ -32,134 +32,243 @@ func validateQuery(statement string) (bool, bool, error) {}type queryValidateListener struct {- *parser.BaseDorisSQLListener+ *parser.BaseDorisParserListenervalid bool}-func (l *queryValidateListener) EnterSingleStatement(ctx *parser.SingleStatementContext) {+// EnterStatementDefault is called when entering the statementDefault production (SELECT queries).+// SELECT statements are valid queries.+func (l *queryValidateListener) EnterStatementDefault(ctx *parser.StatementDefaultContext) {if !l.valid {return}-- stmt := ctx.Statement()- if stmt == nil {+ // SELECT queries are allowed+ if ctx != nil && ctx.Query() != nil {return}+}++// EnterSupportedShowStatementAlias is called for all SHOW statements.+// SHOW statements are valid read-only queries.+func (*queryValidateListener) EnterSupportedShowStatementAlias(_ *parser.SupportedShowStatementAliasContext) {+ // SHOW statements are allowed+}- // Allow SELECT queries and SHOW statements- if stmt.QueryStatement() != nil {+// EnterSupportedDmlStatementAlias is called for DML statements (INSERT, UPDATE, DELETE).+// DML statements are NOT valid read-only queries, unless they have an EXPLAIN prefix.+func (l *queryValidateListener) EnterSupportedDmlStatementAlias(ctx *parser.SupportedDmlStatementAliasContext) {+ if ctx == nil {return}- // Check for SHOW statements- if stmt.ShowAlterStatement() != nil ||- stmt.ShowAnalyzeStatement() != nil ||- stmt.ShowAuthenticationStatement() != nil ||- stmt.ShowAuthorStatement() != nil ||- stmt.ShowBackendBlackListStatement() != nil ||- stmt.ShowBackendsStatement() != nil ||- stmt.ShowBackupStatement() != nil ||- stmt.ShowBaselinePlanStatement() != nil ||- stmt.ShowBrokerStatement() != nil ||- stmt.ShowCatalogRecycleBinStatement() != nil ||- stmt.ShowCatalogsStatement() != nil ||- stmt.ShowCharsetStatement() != nil ||- stmt.ShowClustersStatement() != nil ||- stmt.ShowCollationStatement() != nil ||- stmt.ShowColumnStatement() != nil ||- stmt.ShowColumnStatsStatement() != nil ||- stmt.ShowComputeNodesStatement() != nil ||- stmt.ShowConvertLightSchemaChangeStatement() != nil ||- stmt.ShowCreateDbStatement() != nil ||- stmt.ShowCreateExternalCatalogStatement() != nil ||- stmt.ShowCreateGroupProviderStatement() != nil ||- stmt.ShowCreateLoadStatement() != nil ||- stmt.ShowCreateRepositoryStatement() != nil ||- stmt.ShowCreateRoutineLoadStatement() != nil ||- stmt.ShowCreateSecurityIntegrationStatement() != nil ||- stmt.ShowCreateTableStatement() != nil ||- stmt.ShowDataCacheRulesStatement() != nil ||- stmt.ShowDataDistributionStmt() != nil ||- stmt.ShowDataSkewStatement() != nil ||- stmt.ShowDataStmt() != nil ||- stmt.ShowDataTypesStatement() != nil ||- stmt.ShowDatabaseIdStatement() != nil ||- stmt.ShowDatabasesStatement() != nil ||- stmt.ShowDeleteStatement() != nil ||- stmt.ShowDictionaryStatement() != nil ||- stmt.ShowDynamicPartitionStatement() != nil ||- stmt.ShowEncryptKeysStatement() != nil ||- stmt.ShowEnginesStatement() != nil ||- stmt.ShowEventsStatement() != nil ||- stmt.ShowExportStatement() != nil ||- stmt.ShowFailPointStatement() != nil ||- stmt.ShowFrontendsDisksStatement() != nil ||- stmt.ShowFrontendsStatement() != nil ||- stmt.ShowFunctionsStatement() != nil ||- stmt.ShowGrantsStatement() != nil ||- stmt.ShowGroupProvidersStatement() != nil ||- stmt.ShowHistogramMetaStatement() != nil ||- stmt.ShowIndexStatement() != nil ||- stmt.ShowJobTaskStatement() != nil ||- stmt.ShowLastInsertStatement() != nil ||- stmt.ShowLoadProfileStatement() != nil ||- stmt.ShowLoadStatement() != nil ||- stmt.ShowLoadWarningsStatement() != nil ||- stmt.ShowMaterializedViewsStatement() != nil ||- stmt.ShowMigrationsStatement() != nil ||- stmt.ShowNodesStatement() != nil ||- stmt.ShowOpenTableStatement() != nil ||- stmt.ShowPartitionIdStatement() != nil ||- stmt.ShowPartitionsStatement() != nil ||- stmt.ShowPipeStatement() != nil ||- stmt.ShowPlanAdvisorStatement() != nil ||- stmt.ShowPluginsStatement() != nil ||- stmt.ShowPolicyStatement() != nil ||- stmt.ShowPrivilegesStatement() != nil ||- stmt.ShowProcStatement() != nil ||- stmt.ShowProcedureStatement() != nil ||- stmt.ShowProcesslistStatement() != nil ||- stmt.ShowProfilelistStatement() != nil ||- stmt.ShowQueryProfileStatement() != nil ||- stmt.ShowQueryStatsStatement() != nil ||- stmt.ShowRepositoriesStatement() != nil ||- stmt.ShowResourceGroupStatement() != nil ||- stmt.ShowResourceGroupUsageStatement() != nil ||- stmt.ShowResourceStatement() != nil ||- stmt.ShowRestoreStatement() != nil ||- stmt.ShowRolesStatement() != nil ||- stmt.ShowRoutineLoadStatement() != nil ||- stmt.ShowRoutineLoadTaskStatement() != nil ||- stmt.ShowRunningQueriesStatement() != nil ||- stmt.ShowSecurityIntegrationStatement() != nil ||- stmt.ShowSmallFilesStatement() != nil ||- stmt.ShowSnapshotStatement() != nil ||- stmt.ShowSqlBlackListStatement() != nil ||- stmt.ShowSqlBlockRuleStatement() != nil ||- stmt.ShowStatsMetaStatement() != nil ||- stmt.ShowStatusStatement() != nil ||- stmt.ShowStorageVolumesStatement() != nil ||- stmt.ShowStreamLoadStatement() != nil ||- stmt.ShowSyncJobStatement() != nil ||- stmt.ShowTableIdStatement() != nil ||- stmt.ShowTableStatement() != nil ||- stmt.ShowTableStatsStatement() != nil ||- stmt.ShowTableStatusStatement() != nil ||- stmt.ShowTabletStatement() != nil ||- stmt.ShowTemporaryTablesStatement() != nil ||- stmt.ShowTransactionStatement() != nil ||- stmt.ShowTrashStatement() != nil ||- stmt.ShowTriggersStatement() != nil ||- stmt.ShowUserPropertyStatement() != nil ||- stmt.ShowUserStatement() != nil ||- stmt.ShowVariablesStatement() != nil ||- stmt.ShowWarehousesStatement() != nil ||- stmt.ShowWarningStatement() != nil ||- stmt.ShowWhiteListStatement() != nil ||- stmt.ShowWorkloadGroupsStatement() != nil {- return+ // Check if this DML statement has an EXPLAIN prefix (read-only)+ if dml := ctx.SupportedDmlStatement(); dml != nil {+ hasExplain := false+ switch stmt := dml.(type) {+ case *parser.InsertTableContext:+ hasExplain = stmt.Explain() != nil+ case *parser.UpdateContext:+ hasExplain = stmt.Explain() != nil+ case *parser.DeleteContext:+ hasExplain = stmt.Explain() != nil+ case *parser.MergeIntoContext:+ hasExplain = stmt.Explain() != nil+ }++ if hasExplain {+ // EXPLAIN on DML is read-only, so it's valid+ return+ }}l.valid = false}++// EnterSupportedCreateStatementAlias is called for CREATE statements.+func (l *queryValidateListener) EnterSupportedCreateStatementAlias(_ *parser.SupportedCreateStatementAliasContext) {+ l.valid = false+}++// EnterSupportedAlterStatementAlias is called for ALTER statements.+func (l *queryValidateListener) EnterSupportedAlterStatementAlias(_ *parser.SupportedAlterStatementAliasContext) {+ l.valid = false+}++// EnterSupportedDropStatementAlias is called for DROP statements.+func (l *queryValidateListener) EnterSupportedDropStatementAlias(_ *parser.SupportedDropStatementAliasContext) {+ l.valid = false+}++// EnterMaterializedViewStatementAlias is called for materialized view statements.+func (l *queryValidateListener) EnterMaterializedViewStatementAlias(_ *parser.MaterializedViewStatementAliasContext) {+ l.valid = false+}++// EnterConstraintStatementAlias is called for constraint statements.+func (l *queryValidateListener) EnterConstraintStatementAlias(_ *parser.ConstraintStatementAliasContext) {+ l.valid = false+}++// EnterSupportedLoadStatementAlias is called for LOAD statements.+func (l *queryValidateListener) EnterSupportedLoadStatementAlias(_ *parser.SupportedLoadStatementAliasContext) {+ l.valid = false+}++// EnterSupportedGrantRevokeStatementAlias is called for GRANT/REVOKE statements.+func (l *queryValidateListener) EnterSupportedGrantRevokeStatementAlias(_ *parser.SupportedGrantRevokeStatementAliasContext) {+ l.valid = false+}++// EnterSupportedAdminStatementAlias is called for ADMIN statements.+func (l *queryValidateListener) EnterSupportedAdminStatementAlias(_ *parser.SupportedAdminStatementAliasContext) {+ l.valid = false+}++// EnterSupportedTransactionStatementAlias is called for transaction statements.+func (l *queryValidateListener) EnterSupportedTransactionStatementAlias(_ *parser.SupportedTransactionStatementAliasContext) {+ l.valid = false+}++// EnterSupportedKillStatementAlias is called for KILL statements.+func (l *queryValidateListener) EnterSupportedKillStatementAlias(_ *parser.SupportedKillStatementAliasContext) {+ l.valid = false+}++// EnterSupportedJobStatementAlias is called for JOB statements.+func (l *queryValidateListener) EnterSupportedJobStatementAlias(_ *parser.SupportedJobStatementAliasContext) {+ l.valid = false+}++// EnterSupportedSetStatementAlias is called for SET statements.+func (l *queryValidateListener) EnterSupportedSetStatementAlias(_ *parser.SupportedSetStatementAliasContext) {+ l.valid = false+}++// EnterSupportedUnsetStatementAlias is called for UNSET statements.+func (l *queryValidateListener) EnterSupportedUnsetStatementAlias(_ *parser.SupportedUnsetStatementAliasContext) {+ l.valid = false+}++// EnterSupportedRefreshStatementAlias is called for REFRESH statements.+func (l *queryValidateListener) EnterSupportedRefreshStatementAlias(_ *parser.SupportedRefreshStatementAliasContext) {+ l.valid = false+}++// EnterSupportedCancelStatementAlias is called for CANCEL statements.+func (l *queryValidateListener) EnterSupportedCancelStatementAlias(_ *parser.SupportedCancelStatementAliasContext) {+ l.valid = false+}++// EnterSupportedRecoverStatementAlias is called for RECOVER statements.+func (l *queryValidateListener) EnterSupportedRecoverStatementAlias(_ *parser.SupportedRecoverStatementAliasContext) {+ l.valid = false+}++// EnterSupportedCleanStatementAlias is called for CLEAN statements.+func (l *queryValidateListener) EnterSupportedCleanStatementAlias(_ *parser.SupportedCleanStatementAliasContext) {+ l.valid = false+}++// EnterSupportedOtherStatementAlias is called for other unsupported statements.+func (l *queryValidateListener) EnterSupportedOtherStatementAlias(_ *parser.SupportedOtherStatementAliasContext) {+ l.valid = false+}++// EnterSupportedStatsStatementAlias is called for stats statements.+func (l *queryValidateListener) EnterSupportedStatsStatementAlias(_ *parser.SupportedStatsStatementAliasContext) {+ l.valid = false+}++// EnterSupportedDescribeStatementAlias is called for DESCRIBE statements (read-only).+func (*queryValidateListener) EnterSupportedDescribeStatementAlias(_ *parser.SupportedDescribeStatementAliasContext) {+ // DESCRIBE statements are allowed+}++// The following are SHOW statements nested within other statement categories.+// They override the parent category's invalid setting.++// SHOW statements in supportedLoadStatement+func (l *queryValidateListener) EnterShowCreateLoad(_ *parser.ShowCreateLoadContext) {+ l.valid = true+}++func (l *queryValidateListener) EnterShowCreateRoutineLoad(_ *parser.ShowCreateRoutineLoadContext) {+ l.valid = true+}++func (l *queryValidateListener) EnterShowRoutineLoad(_ *parser.ShowRoutineLoadContext) {+ l.valid = true+}++func (l *queryValidateListener) EnterShowRoutineLoadTask(_ *parser.ShowRoutineLoadTaskContext) {+ l.valid = true+}++func (l *queryValidateListener) EnterShowIndexAnalyzer(_ *parser.ShowIndexAnalyzerContext) {+ l.valid = true+}++func (l *queryValidateListener) EnterShowIndexTokenizer(_ *parser.ShowIndexTokenizerContext) {+ l.valid = true+}++func (l *queryValidateListener) EnterShowIndexTokenFilter(_ *parser.ShowIndexTokenFilterContext) {+ l.valid = true+}++func (l *queryValidateListener) EnterShowIndexCharFilter(_ *parser.ShowIndexCharFilterContext) {+ l.valid = true+}++// SHOW statements in supportedAdminStatement+func (l *queryValidateListener) EnterAdminShowReplicaDistribution(_ *parser.AdminShowReplicaDistributionContext) {+ l.valid = true+}++func (l *queryValidateListener) EnterAdminShowReplicaStatus(_ *parser.AdminShowReplicaStatusContext) {+ l.valid = true+}++func (l *queryValidateListener) EnterAdminShowTabletStorageFormat(_ *parser.AdminShowTabletStorageFormatContext) {+ l.valid = true+}++// SHOW statements in supportedStatsStatement+func (l *queryValidateListener) EnterShowAnalyze(_ *parser.ShowAnalyzeContext) {+ l.valid = true+}++func (l *queryValidateListener) EnterShowQueuedAnalyzeJobs(_ *parser.ShowQueuedAnalyzeJobsContext) {+ l.valid = true+}++func (l *queryValidateListener) EnterShowColumnHistogramStats(_ *parser.ShowColumnHistogramStatsContext) {+ l.valid = true+}++func (l *queryValidateListener) EnterShowColumnStats(_ *parser.ShowColumnStatsContext) {+ l.valid = true+}++func (l *queryValidateListener) EnterShowAnalyzeTask(_ *parser.ShowAnalyzeTaskContext) {+ l.valid = true+}++func (l *queryValidateListener) EnterShowIndexStats(_ *parser.ShowIndexStatsContext) {+ l.valid = true+}++func (l *queryValidateListener) EnterShowTableStats(_ *parser.ShowTableStatsContext) {+ l.valid = true+}++// SHOW statements in materializedViewStatement+func (l *queryValidateListener) EnterShowCreateMTMV(_ *parser.ShowCreateMTMVContext) {+ l.valid = true+}++// SHOW statements in constraintStatement+func (l *queryValidateListener) EnterShowConstraint(_ *parser.ShowConstraintContext) {+ l.valid = true+}diff --git a/backend/plugin/parser/doris/query_span_extractor.go b/backend/plugin/parser/doris/query_span_extractor.goindex dc8d210d5a..df45e5446e 100644--- a/backend/plugin/parser/doris/query_span_extractor.go+++ b/backend/plugin/parser/doris/query_span_extractor.go@@ -88,7 +88,7 @@ func getAccessTables(database string, parseResult *base.ParseResult, ctes map[st}type accessTableListener struct {- *parser.BaseDorisSQLListener+ *parser.BaseDorisParserListenerdefaultDatabase stringsourceColumnSet base.SourceColumnSet@@ -107,12 +107,18 @@ func newAccessTableListener(database string, ctes map[string]bool, gCtx base.Get}}-func (l *accessTableListener) EnterTableAtom(ctx *parser.TableAtomContext) {+// EnterTableName is called when entering a tableName production.+func (l *accessTableListener) EnterTableName(ctx *parser.TableNameContext) {if ctx == nil {return}- list := NormalizeQualifiedName(ctx.QualifiedName())+ multipart := ctx.MultipartIdentifier()+ if multipart == nil {+ return+ }++ list := NormalizeMultipartIdentifier(multipart)switch len(list) {case 1:// Check if this is a CTE reference@@ -137,7 +143,7 @@ func (l *accessTableListener) EnterTableAtom(ctx *parser.TableAtomContext) {// cteListener extracts CTE names from WITH clausestype cteListener struct {- *parser.BaseDorisSQLListener+ *parser.BaseDorisParserListenerctes map[string]bool}@@ -148,30 +154,22 @@ func newCTEListener() *cteListener {}}-// EnterWithClause is called when entering a WITH clause-func (l *cteListener) EnterWithClause(ctx *parser.WithClauseContext) {+// EnterCte is called when entering a CTE production.+func (l *cteListener) EnterCte(ctx *parser.CteContext) {if ctx == nil {return}// Extract all CTEs from the WITH clause- for i := 0; i < ctx.GetChildCount(); i++ {- child := ctx.GetChild(i)- if cte, ok := child.(*parser.CommonTableExpressionContext); ok {- l.extractCTEName(cte)+ for _, aliasQuery := range ctx.AllAliasQuery() {+ if aliasQuery == nil {+ continue}- }-}--// extractCTEName extracts the CTE name from a CommonTableExpression context-func (l *cteListener) extractCTEName(ctx *parser.CommonTableExpressionContext) {- if ctx == nil {- return- }-- // Get the CTE identifier- if ctx.Identifier() != nil {- cteName := NormalizeIdentifier(ctx.Identifier())+ id := aliasQuery.Identifier()+ if id == nil {+ continue+ }+ cteName := NormalizeIdentifier(id)l.ctes[cteName] = true}}diff --git a/backend/plugin/parser/doris/query_span_extractor_cte_test.go b/backend/plugin/parser/doris/query_span_extractor_cte_test.goindex a6573df78b..4ced424c8d 100644--- a/backend/plugin/parser/doris/query_span_extractor_cte_test.go+++ b/backend/plugin/parser/doris/query_span_extractor_cte_test.go@@ -19,14 +19,14 @@ func TestQuerySpanExtractor_CTE(t *testing.T) {{name: "CTE with JOIN between CTE and physical table",sql: `WITH summary AS (- SELECT+ SELECTuser_id,SUM(amount) as total_amountFROM ordersWHERE created_at > '2024-01-01'GROUP BY user_id)- SELECT+ SELECTu.id,u.name,s.total_amount@@ -40,10 +40,10 @@ func TestQuerySpanExtractor_CTE(t *testing.T) {},{name: "Multiple CTEs with cross-database tables",- sql: `WITH+ sql: `WITHcte1 AS (SELECT * FROM db1.table1),cte2 AS (SELECT * FROM db2.table2 WHERE active = 1)- SELECT+ SELECTc1.id,c2.nameFROM cte1 c1@@ -65,7 +65,7 @@ SELECT * FROM cte`,},{name: "Multiple CTEs",- sql: `WITH+ sql: `WITHcte1 AS (SELECT * FROM table1),cte2 AS (SELECT * FROM table2)SELECT * FROM cte1 JOIN cte2`,@@ -78,8 +78,8 @@ SELECT * FROM cte1 JOIN cte2`,{name: "CTE shadowing table name",sql: `WITH products AS (- SELECT p.*, c.name as category_name- FROM items p+ SELECT p.*, c.name as category_name+ FROM items pJOIN categories c ON p.category_id = c.id)SELECT * FROM products WHERE category_name = 'Electronics'`,@@ -103,14 +103,14 @@ SELECT * FROM outer_cte`,},{name: "CTE referencing another CTE",- sql: `WITH+ sql: `WITHbase_data AS (- SELECT id, name, department_id- FROM employees+ SELECT id, name, department_id+ FROM employeesWHERE active = true),dept_summary AS (- SELECT+ SELECTd.name as dept_name,COUNT(b.id) as emp_countFROM base_data bdiff --git a/backend/plugin/parser/doris/query_test.go b/backend/plugin/parser/doris/query_test.goindex d0b096d272..64c3496d88 100644--- a/backend/plugin/parser/doris/query_test.go+++ b/backend/plugin/parser/doris/query_test.go@@ -87,6 +87,21 @@ func TestValidateQuery(t *testing.T) {valid: false,description: "DROP TABLE should be invalid",},+ {+ statement: "EXPLAIN INSERT INTO users (id, name) VALUES (1, 'test')",+ valid: true,+ description: "EXPLAIN INSERT should be valid (read-only)",+ },+ {+ statement: "EXPLAIN UPDATE users SET name = 'test' WHERE id = 1",+ valid: true,+ description: "EXPLAIN UPDATE should be valid (read-only)",+ },+ {+ statement: "EXPLAIN DELETE FROM users WHERE id = 1",+ valid: true,+ description: "EXPLAIN DELETE should be valid (read-only)",+ },}for _, tc := range tests {diff --git a/backend/plugin/parser/doris/query_type.go b/backend/plugin/parser/doris/query_type.goindex b269a8a60a..0ec4830e81 100644--- a/backend/plugin/parser/doris/query_type.go+++ b/backend/plugin/parser/doris/query_type.go@@ -7,139 +7,256 @@ import ()type queryTypeListener struct {- *parser.BaseDorisSQLListener+ *parser.BaseDorisParserListenerallSystems boolresult base.QueryType}-func (l *queryTypeListener) EnterSingleStatement(ctx *parser.SingleStatementContext) {+// EnterStatementDefault is called when entering the statementDefault production (SELECT queries).+func (l *queryTypeListener) EnterStatementDefault(ctx *parser.StatementDefaultContext) {if ctx == nil {return}- s := ctx.Statement()- if s == nil {- return- }-- switch {- case s.QueryStatement() != nil:+ if ctx.Query() != nil {// If all tables are system tables, we should return SelectInfoSchema.if l.allSystems {l.result = base.SelectInfoSchema} else {l.result = base.Select}- case s.InsertStatement() != nil, s.UpdateStatement() != nil, s.DeleteStatement() != nil:- l.result = base.DML- case s.ShowAlterStatement() != nil,- s.ShowAnalyzeStatement() != nil,- s.ShowAuthenticationStatement() != nil,- s.ShowAuthorStatement() != nil,- s.ShowBackendBlackListStatement() != nil,- s.ShowBackendsStatement() != nil,- s.ShowBackupStatement() != nil,- s.ShowBaselinePlanStatement() != nil,- s.ShowBrokerStatement() != nil,- s.ShowCatalogRecycleBinStatement() != nil,- s.ShowCatalogsStatement() != nil,- s.ShowCharsetStatement() != nil,- s.ShowClustersStatement() != nil,- s.ShowCollationStatement() != nil,- s.ShowColumnStatement() != nil,- s.ShowColumnStatsStatement() != nil,- s.ShowComputeNodesStatement() != nil,- s.ShowConvertLightSchemaChangeStatement() != nil,- s.ShowCreateDbStatement() != nil,- s.ShowCreateExternalCatalogStatement() != nil,- s.ShowCreateGroupProviderStatement() != nil,- s.ShowCreateLoadStatement() != nil,- s.ShowCreateRepositoryStatement() != nil,- s.ShowCreateRoutineLoadStatement() != nil,- s.ShowCreateSecurityIntegrationStatement() != nil,- s.ShowCreateTableStatement() != nil,- s.ShowDataCacheRulesStatement() != nil,- s.ShowDataDistributionStmt() != nil,- s.ShowDataSkewStatement() != nil,- s.ShowDataStmt() != nil,- s.ShowDataTypesStatement() != nil,- s.ShowDatabaseIdStatement() != nil,- s.ShowDatabasesStatement() != nil,- s.ShowDeleteStatement() != nil,- s.ShowDictionaryStatement() != nil,- s.ShowDynamicPartitionStatement() != nil,- s.ShowEncryptKeysStatement() != nil,- s.ShowEnginesStatement() != nil,- s.ShowEventsStatement() != nil,- s.ShowExportStatement() != nil,- s.ShowFailPointStatement() != nil,- s.ShowFrontendsDisksStatement() != nil,- s.ShowFrontendsStatement() != nil,- s.ShowFunctionsStatement() != nil,- s.ShowGrantsStatement() != nil,- s.ShowGroupProvidersStatement() != nil,- s.ShowHistogramMetaStatement() != nil,- s.ShowIndexStatement() != nil,- s.ShowJobTaskStatement() != nil,- s.ShowLastInsertStatement() != nil,- s.ShowLoadProfileStatement() != nil,- s.ShowLoadStatement() != nil,- s.ShowLoadWarningsStatement() != nil,- s.ShowMaterializedViewsStatement() != nil,- s.ShowMigrationsStatement() != nil,- s.ShowNodesStatement() != nil,- s.ShowOpenTableStatement() != nil,- s.ShowPartitionIdStatement() != nil,- s.ShowPartitionsStatement() != nil,- s.ShowPipeStatement() != nil,- s.ShowPlanAdvisorStatement() != nil,- s.ShowPluginsStatement() != nil,- s.ShowPolicyStatement() != nil,- s.ShowPrivilegesStatement() != nil,- s.ShowProcStatement() != nil,- s.ShowProcedureStatement() != nil,- s.ShowProcesslistStatement() != nil,- s.ShowProfilelistStatement() != nil,- s.ShowQueryProfileStatement() != nil,- s.ShowQueryStatsStatement() != nil,- s.ShowRepositoriesStatement() != nil,- s.ShowResourceGroupStatement() != nil,- s.ShowResourceGroupUsageStatement() != nil,- s.ShowResourceStatement() != nil,- s.ShowRestoreStatement() != nil,- s.ShowRolesStatement() != nil,- s.ShowRoutineLoadStatement() != nil,- s.ShowRoutineLoadTaskStatement() != nil,- s.ShowRunningQueriesStatement() != nil,- s.ShowSecurityIntegrationStatement() != nil,- s.ShowSmallFilesStatement() != nil,- s.ShowSnapshotStatement() != nil,- s.ShowSqlBlackListStatement() != nil,- s.ShowSqlBlockRuleStatement() != nil,- s.ShowStatsMetaStatement() != nil,- s.ShowStatusStatement() != nil,- s.ShowStorageVolumesStatement() != nil,- s.ShowStreamLoadStatement() != nil,- s.ShowSyncJobStatement() != nil,- s.ShowTableIdStatement() != nil,- s.ShowTableStatement() != nil,- s.ShowTableStatsStatement() != nil,- s.ShowTableStatusStatement() != nil,- s.ShowTabletStatement() != nil,- s.ShowTemporaryTablesStatement() != nil,- s.ShowTransactionStatement() != nil,- s.ShowTrashStatement() != nil,- s.ShowTriggersStatement() != nil,- s.ShowUserPropertyStatement() != nil,- s.ShowUserStatement() != nil,- s.ShowVariablesStatement() != nil,- s.ShowWarehousesStatement() != nil,- s.ShowWarningStatement() != nil,- s.ShowWhiteListStatement() != nil,- s.ShowWorkloadGroupsStatement() != nil:- l.result = base.SelectInfoSchema- default:- l.result = base.DDL}}++// EnterSupportedDmlStatementAlias is called for DML statements (INSERT, UPDATE, DELETE).+// If the statement has an EXPLAIN prefix, it's treated as a read-only query.+func (l *queryTypeListener) EnterSupportedDmlStatementAlias(ctx *parser.SupportedDmlStatementAliasContext) {+ if ctx == nil {+ return+ }++ // Check if this DML statement has an EXPLAIN prefix+ if dml := ctx.SupportedDmlStatement(); dml != nil {+ hasExplain := false+ switch stmt := dml.(type) {+ case *parser.InsertTableContext:+ hasExplain = stmt.Explain() != nil+ case *parser.UpdateContext:+ hasExplain = stmt.Explain() != nil+ case *parser.DeleteContext:+ hasExplain = stmt.Explain() != nil+ case *parser.MergeIntoContext:+ hasExplain = stmt.Explain() != nil+ }++ if hasExplain {+ // EXPLAIN on DML is read-only+ l.result = base.Select+ return+ }+ }++ l.result = base.DML+}++// EnterSupportedShowStatementAlias is called for all SHOW statements.+func (l *queryTypeListener) EnterSupportedShowStatementAlias(_ *parser.SupportedShowStatementAliasContext) {+ l.result = base.SelectInfoSchema+}++// EnterSupportedCreateStatementAlias is called for all CREATE statements.+func (l *queryTypeListener) EnterSupportedCreateStatementAlias(_ *parser.SupportedCreateStatementAliasContext) {+ l.result = base.DDL+}++// EnterSupportedAlterStatementAlias is called for all ALTER statements.+func (l *queryTypeListener) EnterSupportedAlterStatementAlias(_ *parser.SupportedAlterStatementAliasContext) {+ l.result = base.DDL+}++// EnterSupportedDropStatementAlias is called for all DROP statements.+func (l *queryTypeListener) EnterSupportedDropStatementAlias(_ *parser.SupportedDropStatementAliasContext) {+ l.result = base.DDL+}++// EnterMaterializedViewStatementAlias is called for materialized view statements.+func (l *queryTypeListener) EnterMaterializedViewStatementAlias(_ *parser.MaterializedViewStatementAliasContext) {+ l.result = base.DDL+}++// EnterConstraintStatementAlias is called for constraint statements.+func (l *queryTypeListener) EnterConstraintStatementAlias(_ *parser.ConstraintStatementAliasContext) {+ l.result = base.DDL+}++// EnterSupportedDescribeStatementAlias is called for DESCRIBE statements (read-only).+func (l *queryTypeListener) EnterSupportedDescribeStatementAlias(_ *parser.SupportedDescribeStatementAliasContext) {+ l.result = base.SelectInfoSchema+}++// EnterSupportedUseStatementAlias is called for USE statements.+// USE statements are treated as unknown so they can be forbidden.+func (l *queryTypeListener) EnterSupportedUseStatementAlias(_ *parser.SupportedUseStatementAliasContext) {+ l.result = base.QueryTypeUnknown+}++// The following statement types default to DDL as they can modify data or schema.++// EnterSupportedLoadStatementAlias is called for LOAD statements.+func (l *queryTypeListener) EnterSupportedLoadStatementAlias(_ *parser.SupportedLoadStatementAliasContext) {+ l.result = base.DDL+}++// EnterSupportedGrantRevokeStatementAlias is called for GRANT/REVOKE statements.+func (l *queryTypeListener) EnterSupportedGrantRevokeStatementAlias(_ *parser.SupportedGrantRevokeStatementAliasContext) {+ l.result = base.DDL+}++// EnterSupportedAdminStatementAlias is called for ADMIN statements.+func (l *queryTypeListener) EnterSupportedAdminStatementAlias(_ *parser.SupportedAdminStatementAliasContext) {+ l.result = base.DDL+}++// EnterSupportedTransactionStatementAlias is called for transaction statements.+func (l *queryTypeListener) EnterSupportedTransactionStatementAlias(_ *parser.SupportedTransactionStatementAliasContext) {+ l.result = base.DDL+}++// EnterSupportedKillStatementAlias is called for KILL statements.+func (l *queryTypeListener) EnterSupportedKillStatementAlias(_ *parser.SupportedKillStatementAliasContext) {+ l.result = base.DDL+}++// EnterSupportedJobStatementAlias is called for JOB statements.+func (l *queryTypeListener) EnterSupportedJobStatementAlias(_ *parser.SupportedJobStatementAliasContext) {+ l.result = base.DDL+}++// EnterSupportedSetStatementAlias is called for SET statements.+func (l *queryTypeListener) EnterSupportedSetStatementAlias(_ *parser.SupportedSetStatementAliasContext) {+ l.result = base.DDL+}++// EnterSupportedUnsetStatementAlias is called for UNSET statements.+func (l *queryTypeListener) EnterSupportedUnsetStatementAlias(_ *parser.SupportedUnsetStatementAliasContext) {+ l.result = base.DDL+}++// EnterSupportedRefreshStatementAlias is called for REFRESH statements.+func (l *queryTypeListener) EnterSupportedRefreshStatementAlias(_ *parser.SupportedRefreshStatementAliasContext) {+ l.result = base.DDL+}++// EnterSupportedCancelStatementAlias is called for CANCEL statements.+func (l *queryTypeListener) EnterSupportedCancelStatementAlias(_ *parser.SupportedCancelStatementAliasContext) {+ l.result = base.DDL+}++// EnterSupportedRecoverStatementAlias is called for RECOVER statements.+func (l *queryTypeListener) EnterSupportedRecoverStatementAlias(_ *parser.SupportedRecoverStatementAliasContext) {+ l.result = base.DDL+}++// EnterSupportedCleanStatementAlias is called for CLEAN statements.+func (l *queryTypeListener) EnterSupportedCleanStatementAlias(_ *parser.SupportedCleanStatementAliasContext) {+ l.result = base.DDL+}++// EnterSupportedOtherStatementAlias is called for other statements not covered above.+func (l *queryTypeListener) EnterSupportedOtherStatementAlias(_ *parser.SupportedOtherStatementAliasContext) {+ l.result = base.DDL+}++// EnterSupportedStatsStatementAlias is called for stats statements.+func (l *queryTypeListener) EnterSupportedStatsStatementAlias(_ *parser.SupportedStatsStatementAliasContext) {+ l.result = base.DDL+}++// The following are SHOW statements nested within other statement categories.+// They override the parent category's DDL setting with SelectInfoSchema.++// SHOW statements in supportedLoadStatement+func (l *queryTypeListener) EnterShowCreateLoad(_ *parser.ShowCreateLoadContext) {+ l.result = base.SelectInfoSchema+}++func (l *queryTypeListener) EnterShowCreateRoutineLoad(_ *parser.ShowCreateRoutineLoadContext) {+ l.result = base.SelectInfoSchema+}++func (l *queryTypeListener) EnterShowRoutineLoad(_ *parser.ShowRoutineLoadContext) {+ l.result = base.SelectInfoSchema+}++func (l *queryTypeListener) EnterShowRoutineLoadTask(_ *parser.ShowRoutineLoadTaskContext) {+ l.result = base.SelectInfoSchema+}++func (l *queryTypeListener) EnterShowIndexAnalyzer(_ *parser.ShowIndexAnalyzerContext) {+ l.result = base.SelectInfoSchema+}++func (l *queryTypeListener) EnterShowIndexTokenizer(_ *parser.ShowIndexTokenizerContext) {+ l.result = base.SelectInfoSchema+}++func (l *queryTypeListener) EnterShowIndexTokenFilter(_ *parser.ShowIndexTokenFilterContext) {+ l.result = base.SelectInfoSchema+}++func (l *queryTypeListener) EnterShowIndexCharFilter(_ *parser.ShowIndexCharFilterContext) {+ l.result = base.SelectInfoSchema+}++// SHOW statements in supportedAdminStatement+func (l *queryTypeListener) EnterAdminShowReplicaDistribution(_ *parser.AdminShowReplicaDistributionContext) {+ l.result = base.SelectInfoSchema+}++func (l *queryTypeListener) EnterAdminShowReplicaStatus(_ *parser.AdminShowReplicaStatusContext) {+ l.result = base.SelectInfoSchema+}++func (l *queryTypeListener) EnterAdminShowTabletStorageFormat(_ *parser.AdminShowTabletStorageFormatContext) {+ l.result = base.SelectInfoSchema+}++// SHOW statements in supportedStatsStatement+func (l *queryTypeListener) EnterShowAnalyze(_ *parser.ShowAnalyzeContext) {+ l.result = base.SelectInfoSchema+}++func (l *queryTypeListener) EnterShowQueuedAnalyzeJobs(_ *parser.ShowQueuedAnalyzeJobsContext) {+ l.result = base.SelectInfoSchema+}++func (l *queryTypeListener) EnterShowColumnHistogramStats(_ *parser.ShowColumnHistogramStatsContext) {+ l.result = base.SelectInfoSchema+}++func (l *queryTypeListener) EnterShowColumnStats(_ *parser.ShowColumnStatsContext) {+ l.result = base.SelectInfoSchema+}++func (l *queryTypeListener) EnterShowAnalyzeTask(_ *parser.ShowAnalyzeTaskContext) {+ l.result = base.SelectInfoSchema+}++func (l *queryTypeListener) EnterShowIndexStats(_ *parser.ShowIndexStatsContext) {+ l.result = base.SelectInfoSchema+}++func (l *queryTypeListener) EnterShowTableStats(_ *parser.ShowTableStatsContext) {+ l.result = base.SelectInfoSchema+}++// SHOW statements in materializedViewStatement+func (l *queryTypeListener) EnterShowCreateMTMV(_ *parser.ShowCreateMTMVContext) {+ l.result = base.SelectInfoSchema+}++// SHOW statements in constraintStatement+func (l *queryTypeListener) EnterShowConstraint(_ *parser.ShowConstraintContext) {+ l.result = base.SelectInfoSchema+}diff --git a/backend/plugin/parser/doris/split.go b/backend/plugin/parser/doris/split.goindex bd772d1bf6..11bec9b3b0 100644--- a/backend/plugin/parser/doris/split.go+++ b/backend/plugin/parser/doris/split.go@@ -15,9 +15,9 @@ func init() {// SplitSQL splits the input into multiple SQL statements using semicolon as delimiter.func SplitSQL(statement string) ([]base.SingleSQL, error) {- lexer := parser.NewDorisSQLLexer(antlr.NewInputStream(statement))+ lexer := parser.NewDorisLexer(antlr.NewInputStream(statement))stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)stream.Fill()- return base.SplitSQLByLexer(stream, parser.DorisSQLLexerSEMICOLON, statement)+ return base.SplitSQLByLexer(stream, parser.DorisLexerSEMICOLON, statement)}diff --git a/backend/plugin/parser/doris/statement_ranges.go b/backend/plugin/parser/doris/statement_ranges.goindex ffe8c00ea3..aff6d4b3f3 100644--- a/backend/plugin/parser/doris/statement_ranges.go+++ b/backend/plugin/parser/doris/statement_ranges.go@@ -19,9 +19,9 @@ func init() {func GetStatementRanges(_ context.Context, _ base.StatementRangeContext, statement string) ([]base.Range, error) {createLexer := func(input antlr.CharStream) antlr.Lexer {- return parser.NewDorisSQLLexer(input)+ return parser.NewDorisLexer(input)}stream := base.PrepareANTLRTokenStream(statement, createLexer)- ranges := base.GetANTLRStatementRangesUTF16Position(stream, parser.DorisSQLParserEOF, parser.DorisSQLParserSEMICOLON)+ ranges := base.GetANTLRStatementRangesUTF16Position(stream, parser.DorisParserEOF, parser.DorisParserSEMICOLON)return ranges, nil}diff --git a/go.mod b/go.modindex 8cf51c956f..9a2088cd80 100644--- a/go.mod+++ b/go.mod@@ -293,7 +293,7 @@ require (github.com/aws/aws-sdk-go-v2/service/sts v1.39.0github.com/aws/smithy-go v1.23.1 // indirectgithub.com/beorn7/perks v1.0.1 // indirect- github.com/bytebase/parser v0.0.0-20251117032631-393e2917be3f+ github.com/bytebase/parser v0.0.0-20251201062756-17b16190b32dgithub.com/cespare/xxhash/v2 v2.3.0 // indirectgithub.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirectgithub.com/cockroachdb/cockroach-go/v2 v2.4.2diff --git a/go.sum b/go.sumindex c089159ef2..d313b178af 100644--- a/go.sum+++ b/go.sum@@ -853,8 +853,8 @@ github.com/bytebase/gosasl v0.0.0-20240422091407-6b7481e86f08 h1:S1GgjJLspz4E4z4github.com/bytebase/gosasl v0.0.0-20240422091407-6b7481e86f08/go.mod h1:Qx8cW6jkI8riyzmklj80kAIkv+iezFUTBiGU0qHhHes=github.com/bytebase/lsp-protocol v0.0.0-20250324071136-1586d0c10ff0 h1:bJ8NSf2K+pccl5m/wuu97fiYjDwpJH6IzURAq/3XA2U=github.com/bytebase/lsp-protocol v0.0.0-20250324071136-1586d0c10ff0/go.mod h1:BEWMfiZtqshdmulKJcIsWb45MUaEvDO4CROcgi8dfFg=-github.com/bytebase/parser v0.0.0-20251117032631-393e2917be3f h1:1Zo9bMTS/VMpUC4IcNpqUjj+rzyAJ1ktWjcSOALYRlU=-github.com/bytebase/parser v0.0.0-20251117032631-393e2917be3f/go.mod h1:jeak/EfutSOAuWKvrFIT2IZunhWprM7oTFBRgZ9RCxo=+github.com/bytebase/parser v0.0.0-20251201062756-17b16190b32d h1:LBTnKLZqL0874ObEgts0ptTMZUnALrvNADhBwkdyfHQ=+github.com/bytebase/parser v0.0.0-20251201062756-17b16190b32d/go.mod h1:jeak/EfutSOAuWKvrFIT2IZunhWprM7oTFBRgZ9RCxo=github.com/bytebase/pgx/v5 v5.0.0-20250212161523-96ff8aed8767 h1:YuR5G3LcxpO5ScSTA+Kdirxg9RW4TRc/v1t7N2Hfmbw=github.com/bytebase/pgx/v5 v5.0.0-20250212161523-96ff8aed8767/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ=github.com/bytebase/pkcs8 v0.0.0-20240612095628-fcd0a7484c94 h1:6PNsuNmSqCuR8Z616uQLzDIvujWCFsKzeVc3ECmVubk=