Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

fix: fix doris dump and create database bugs (#17682)

rebelicea6c13351a819
diff --git a/backend/api/v1/rollout_service_task.go b/backend/api/v1/rollout_service_task.go
index 46cbff48cb..9a751145be 100644
--- a/backend/api/v1/rollout_service_task.go
+++ b/backend/api/v1/rollout_service_task.go
@@ -560,7 +560,7 @@ func checkCharacterSetCollationOwner(dbType storepb.Engine, characterSet, collat
if owner == "" {
return errors.Errorf("database owner is required for CockroachDB")
}
- case storepb.Engine_SQLITE, storepb.Engine_MONGODB, storepb.Engine_MSSQL:
+ case storepb.Engine_SQLITE, storepb.Engine_MONGODB, storepb.Engine_MSSQL, storepb.Engine_DORIS:
// no-op.
default:
if characterSet == "" {
@@ -632,6 +632,8 @@ func getCreateDatabaseStatement(dbType storepb.Engine, c *storepb.PlanConfig_Cre
return fmt.Sprintf("%s;", stmt), nil
case storepb.Engine_HIVE:
return fmt.Sprintf("CREATE DATABASE %s;", databaseName), nil
+ case storepb.Engine_DORIS:
+ return fmt.Sprintf("CREATE DATABASE %s;", databaseName), nil
default:
return "", errors.Errorf("unsupported database type %s", dbType)
}
diff --git a/backend/component/sheet/sheet.go b/backend/component/sheet/sheet.go
index 9297c6eb71..b60ea3812d 100644
--- a/backend/component/sheet/sheet.go
+++ b/backend/component/sheet/sheet.go
@@ -22,6 +22,7 @@ import (
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/parser/base"
crparser "github.com/bytebase/bytebase/backend/plugin/parser/cockroachdb"
+ "github.com/bytebase/bytebase/backend/plugin/parser/doris"
mysqlparser "github.com/bytebase/bytebase/backend/plugin/parser/mysql"
partiqlparser "github.com/bytebase/bytebase/backend/plugin/parser/partiql"
pgrawparser "github.com/bytebase/bytebase/backend/plugin/parser/pg/legacy"
@@ -241,6 +242,8 @@ func syntaxCheck(dbType storepb.Engine, statement string) (any, []*storepb.Advic
return partiqlSyntaxCheck(statement)
case storepb.Engine_COCKROACHDB:
return cockroachdbSyntaxCheck(statement)
+ case storepb.Engine_DORIS:
+ return dorisSyntaxCheck(statement)
default:
// Return default advice for unsupported database types
}
@@ -255,6 +258,37 @@ func syntaxCheck(dbType storepb.Engine, statement string) (any, []*storepb.Advic
}
}
+func dorisSyntaxCheck(statement string) (any, []*storepb.Advice) {
+ result, err := doris.ParseDorisSQL(statement)
+ if err != nil {
+ if syntaxErr, ok := err.(*base.SyntaxError); ok {
+ return nil, []*storepb.Advice{
+ {
+ Status: storepb.Advice_WARNING,
+ Code: StatementSyntaxErrorCode,
+ Title: SyntaxErrorTitle,
+ Content: syntaxErr.Message,
+ StartPosition: syntaxErr.Position,
+ },
+ }
+ }
+ return nil, []*storepb.Advice{
+ {
+ Status: storepb.Advice_WARNING,
+ Code: InternalErrorCode,
+ Title: "Parse error",
+ Content: err.Error(),
+ StartPosition: common.FirstLinePosition,
+ },
+ }
+ }
+
+ if result == nil {
+ return nil, nil
+ }
+ return result, nil
+}
+
func cockroachdbSyntaxCheck(statement string) (any, []*storepb.Advice) {
result, err := crparser.ParseCockroachDBSQL(statement)
if err != nil {
diff --git a/backend/plugin/db/starrocks/dump.go b/backend/plugin/db/starrocks/dump.go
index 2c63dc4cef..8c427628f1 100644
--- a/backend/plugin/db/starrocks/dump.go
+++ b/backend/plugin/db/starrocks/dump.go
@@ -299,7 +299,8 @@ func getTableStmt(txn *sql.Tx, dbName, tblName, tblType string) (string, error)
}
return fmt.Sprintf(viewStmtFmt, tblName, createStmt), nil
default:
- return "", errors.Errorf("unrecognized table type %q for database %q table %q", tblType, dbName, tblName)
+ slog.Debug("skip unsupported table type", slog.String("dbName", dbName), slog.String("tableName", tblName), slog.String("tableType", tblType))
+ return "", nil
}
}