Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

fix(kingbase): detect compatibility mode independently of catalogs (#12822)

Hand Sonic3b22c5afc6ae
diff --git a/agents/drivers/kingbase-go/kingbase_metadata.go b/agents/drivers/kingbase-go/kingbase_metadata.go
index 0fcf320e6e..e2727df906 100644
--- a/agents/drivers/kingbase-go/kingbase_metadata.go
+++ b/agents/drivers/kingbase-go/kingbase_metadata.go
@@ -212,12 +212,13 @@ func detectKingbaseMode(db *sql.DB, configuredMySQL bool) kingbaseMode {
}
mode := kingbaseMode{compatibilityMode: detectDatabaseMode(db)}
mode.postgresCatalog = !catalogExists(db, "sys_catalog.sys_namespace") && catalogExists(db, "pg_catalog.pg_namespace")
+ // Catalog availability and the SQL compatibility mode are independent.
+ if mode.compatibilityMode != "" {
+ mode.mysqlCompat = mode.compatibilityMode == "mysql"
+ } else if !mode.postgresCatalog {
+ mode.mysqlCompat = supportsBacktickIdentifiers(db)
+ }
if !mode.postgresCatalog {
- if mode.compatibilityMode != "" {
- mode.mysqlCompat = mode.compatibilityMode == "mysql"
- } else {
- mode.mysqlCompat = supportsBacktickIdentifiers(db)
- }
mode.sqlServerIdentity = !mode.mysqlCompat && catalogExists(db, "sys.identity_columns")
}
return mode
@@ -241,23 +242,29 @@ func detectMySQLCompatMode(db *sql.DB) bool {
}
func detectDatabaseMode(db *sql.DB) string {
- var databaseMode string
- switch err := db.QueryRow("SELECT setting FROM sys_catalog.sys_settings WHERE LOWER(name) = 'database_mode'").Scan(&databaseMode); {
- case err == nil:
- // Treat database_mode as authoritative when the server exposes it. This
- // avoids misclassifying Oracle-compatible servers that also publish
- // sql_mode for MySQL syntax toggles such as ANSI_QUOTES.
- return strings.ToLower(strings.TrimSpace(databaseMode))
- case errors.Is(err, sql.ErrNoRows):
- return ""
- default:
- return ""
+ ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+ defer cancel()
+ for _, query := range []string{
+ "SELECT setting FROM sys_catalog.sys_settings WHERE LOWER(name) = 'database_mode'",
+ "SELECT setting FROM pg_catalog.pg_settings WHERE LOWER(name) = 'database_mode'",
+ "SHOW database_mode",
+ } {
+ var databaseMode string
+ if err := db.QueryRowContext(ctx, query).Scan(&databaseMode); err == nil {
+ // The reported mode wins over syntax probes, including unknown future modes.
+ if mode := strings.ToLower(strings.TrimSpace(databaseMode)); mode != "" {
+ return mode
+ }
+ }
}
+ return ""
}
func supportsBacktickIdentifiers(db *sql.DB) bool {
var value int
- return db.QueryRow("SELECT 1 AS `dbx_identifier_probe`").Scan(&value) == nil
+ ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+ defer cancel()
+ return db.QueryRowContext(ctx, "SELECT 1 AS `dbx_identifier_probe`").Scan(&value) == nil
}
func (s *server) identifierQuote() string {
diff --git a/agents/drivers/kingbase-go/main_test.go b/agents/drivers/kingbase-go/main_test.go
index 3efe336dbe..204eefd45b 100644
--- a/agents/drivers/kingbase-go/main_test.go
+++ b/agents/drivers/kingbase-go/main_test.go
@@ -4536,7 +4536,7 @@ func TestDetectMySQLCompatModeProbesBacktickSyntaxWhenDatabaseModeMissing(t *tes
state.mu.Lock()
defer state.mu.Unlock()
- if len(state.queries) != 2 || !strings.Contains(state.queries[1], "dbx_identifier_probe") {
+ if len(state.queries) != 4 || !strings.Contains(state.queries[3], "dbx_identifier_probe") {
t.Fatalf("expected database_mode probe followed by backtick syntax probe, got: %v", state.queries)
}
}
diff --git a/agents/drivers/kingbase-go/mode_detection_compatibility_test.go b/agents/drivers/kingbase-go/mode_detection_compatibility_test.go
new file mode 100644
index 0000000000..e54ec9fd61
--- /dev/null
+++ b/agents/drivers/kingbase-go/mode_detection_compatibility_test.go
@@ -0,0 +1,49 @@
+package main
+
+import (
+ "database/sql/driver"
+ "errors"
+ "strings"
+ "testing"
+)
+
+func TestModeAndCatalogAvailabilityAreIndependent(t *testing.T) {
+ for _, mode := range []string{"oracle", "pg", "mysql", "sqlserver", "future_mode"} {
+ t.Run(mode, func(t *testing.T) {
+ state := &metadataDriverState{query: func(query string) (driver.Rows, error) {
+ if strings.Contains(query, "pg_catalog.pg_settings") {
+ return &valueRows{columns: []string{"setting"}, rows: [][]driver.Value{{" " + strings.ToUpper(mode) + " "}}}, nil
+ }
+ if strings.Contains(query, "pg_catalog.pg_namespace") {
+ return &valueRows{columns: []string{"value"}}, nil
+ }
+ return nil, errors.New("unavailable")
+ }}
+ got := detectKingbaseMode(openMetadataDB(t, state), false)
+ if got.compatibilityMode != mode || !got.postgresCatalog || got.mysqlCompat != (mode == "mysql") {
+ t.Fatalf("unexpected profile: %+v", got)
+ }
+ for _, query := range state.snapshotQueries() {
+ if strings.Contains(query, "dbx_identifier_probe") {
+ t.Fatal("a reported mode must not be overridden by a syntax probe")
+ }
+ }
+ })
+ }
+}
+
+func TestDatabaseModeFallsBackAcrossCatalogGenerations(t *testing.T) {
+ for _, source := range []string{"pg_catalog.pg_settings", "SHOW database_mode"} {
+ t.Run(source, func(t *testing.T) {
+ state := &metadataDriverState{query: func(query string) (driver.Rows, error) {
+ if strings.Contains(query, source) {
+ return &valueRows{columns: []string{"setting"}, rows: [][]driver.Value{{"oracle"}}}, nil
+ }
+ return nil, errors.New("catalog is not available on this release")
+ }}
+ if got := detectDatabaseMode(openMetadataDB(t, state)); got != "oracle" {
+ t.Fatalf("database mode = %q; queries: %v", got, state.snapshotQueries())
+ }
+ })
+ }
+}