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): recognize release JDBC URLs and bound version probes (#12815)

Hand Sonic249d52a1f37a
diff --git a/agents/drivers/kingbase-go/jdbc_release_urls_test.go b/agents/drivers/kingbase-go/jdbc_release_urls_test.go
new file mode 100644
index 0000000000..7feecebde2
--- /dev/null
+++ b/agents/drivers/kingbase-go/jdbc_release_urls_test.go
@@ -0,0 +1,16 @@
+package main
+
+import "testing"
+
+func TestKingbaseJDBCReleaseURLsUseStructuredConnection(t *testing.T) {
+ for _, prefix := range []string{"kingbase", "kingbase8", "kingbase83", "kingbase86"} {
+ t.Run(prefix, func(t *testing.T) {
+ cp := connectParams{Host: "db.example.test", Port: 54321, Database: "test", Username: "test_user"}
+ want := buildDSNWithSSLMode(cp, "require")
+ cp.ConnectionString = "jdbc:" + prefix + "://db.example.test:54321/test"
+ if got := buildDSNWithSSLMode(cp, "require"); got != want {
+ t.Fatalf("JDBC marker must not be forwarded as a native DSN: got %q, want %q", got, want)
+ }
+ })
+ }
+}
diff --git a/agents/drivers/kingbase-go/kingbase_metadata.go b/agents/drivers/kingbase-go/kingbase_metadata.go
index 726ae619d2..0fcf320e6e 100644
--- a/agents/drivers/kingbase-go/kingbase_metadata.go
+++ b/agents/drivers/kingbase-go/kingbase_metadata.go
@@ -47,7 +47,9 @@ var kingbaseReleasePattern = regexp.MustCompile(`(?i)\bV0*([0-9]+)R`)
func detectKingbaseV7(db *sql.DB) bool {
var version string
- if err := db.QueryRow("SELECT version()").Scan(&version); err != nil {
+ ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+ defer cancel()
+ if err := db.QueryRowContext(ctx, "SELECT version()").Scan(&version); err != nil {
return false
}
match := kingbaseReleasePattern.FindStringSubmatch(version)
diff --git a/agents/drivers/kingbase-go/main.go b/agents/drivers/kingbase-go/main.go
index 0beee8d72e..6b287f4136 100644
--- a/agents/drivers/kingbase-go/main.go
+++ b/agents/drivers/kingbase-go/main.go
@@ -1394,7 +1394,13 @@ func isNativeDSNSpace(value byte) bool {
}
func isKingbaseJDBCURL(value string) bool {
- return strings.HasPrefix(strings.ToLower(strings.TrimSpace(value)), "jdbc:kingbase8://")
+ value = strings.ToLower(strings.TrimSpace(value))
+ for _, prefix := range []string{"jdbc:kingbase://", "jdbc:kingbase8://", "jdbc:kingbase83://", "jdbc:kingbase86://"} {
+ if strings.HasPrefix(value, prefix) {
+ return true
+ }
+ }
+ return false
}
func quoteDSNValue(value string) string {
diff --git a/agents/drivers/kingbase-go/main_test.go b/agents/drivers/kingbase-go/main_test.go
index b0768d5d12..3efe336dbe 100644
--- a/agents/drivers/kingbase-go/main_test.go
+++ b/agents/drivers/kingbase-go/main_test.go
@@ -1869,7 +1869,9 @@ func TestKingbaseV7VersionPattern(t *testing.T) {
v7 bool
}{
{version: "Kingbase V007R001C002B0014", v7: true},
+ {version: "KingbaseES V008R003C002B0320"},
{version: "KingbaseES V008R006C008B0014"},
+ {version: "KingbaseES V009R001C010B0001"},
{version: "PostgreSQL 12.1"},
} {
match := kingbaseReleasePattern.FindStringSubmatch(test.version)