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(vastbase): tolerate null current_schema in connection info

zhukjd93a202c35ad
diff --git a/agents/drivers/vastbase-go/connection_info_test.go b/agents/drivers/vastbase-go/connection_info_test.go
index 972b11fbf0..c36552e24b 100644
--- a/agents/drivers/vastbase-go/connection_info_test.go
+++ b/agents/drivers/vastbase-go/connection_info_test.go
@@ -36,6 +36,24 @@ func TestConnectionInfoAndTestConnectionExposeDatabaseInfo(t *testing.T) {
assertVastbaseDatabaseInfo(t, result["databaseInfo"])
}
+func TestConnectionInfoAllowsNullCurrentSchema(t *testing.T) {
+ db := openConnectionInfoTestDB(t, true)
+ server := newServer()
+ server.db = db
+ server.mode.mysqlCompat = true
+
+ info, err := server.connectionInfo()
+ if err != nil {
+ t.Fatal(err)
+ }
+ if info["schema"] != "" {
+ t.Fatalf("unexpected schema: %#v", info["schema"])
+ }
+ if info["identifierQuote"] != "`" {
+ t.Fatalf("unexpected identifier quote: %#v", info["identifierQuote"])
+ }
+}
+
func assertVastbaseDatabaseInfo(t *testing.T, value any) {
t.Helper()
info, ok := value.(map[string]string)
@@ -59,23 +77,31 @@ func assertVastbaseDatabaseInfo(t *testing.T, value any) {
var connectionInfoDriverSequence atomic.Uint64
-type connectionInfoTestDriver struct{}
+type connectionInfoTestDriver struct {
+ nullSchema bool
+}
-func (*connectionInfoTestDriver) Open(string) (driver.Conn, error) {
- return &connectionInfoTestConn{}, nil
+func (d *connectionInfoTestDriver) Open(string) (driver.Conn, error) {
+ return &connectionInfoTestConn{nullSchema: d.nullSchema}, nil
}
-type connectionInfoTestConn struct{}
+type connectionInfoTestConn struct {
+ nullSchema bool
+}
func (*connectionInfoTestConn) Prepare(string) (driver.Stmt, error) { return nil, driver.ErrSkip }
func (*connectionInfoTestConn) Close() error { return nil }
func (*connectionInfoTestConn) Begin() (driver.Tx, error) { return nil, driver.ErrSkip }
func (*connectionInfoTestConn) Ping(context.Context) error { return nil }
-func (*connectionInfoTestConn) QueryContext(_ context.Context, _ string, _ []driver.NamedValue) (driver.Rows, error) {
+func (c *connectionInfoTestConn) QueryContext(_ context.Context, _ string, _ []driver.NamedValue) (driver.Rows, error) {
+ var schema driver.Value = "public"
+ if c.nullSchema {
+ schema = nil
+ }
return &connectionInfoTestRows{
columns: []string{"current_database", "current_user", "version", "current_schema"},
- values: []driver.Value{"postgres", "vbadmin", "Vastbase G100 V3.0.9", "public"},
+ values: []driver.Value{"postgres", "vbadmin", "Vastbase G100 V3.0.9", schema},
}, nil
}
@@ -97,10 +123,10 @@ func (rows *connectionInfoTestRows) Next(destination []driver.Value) error {
return nil
}
-func openConnectionInfoTestDB(t *testing.T) *sql.DB {
+func openConnectionInfoTestDB(t *testing.T, nullSchema ...bool) *sql.DB {
t.Helper()
driverName := fmt.Sprintf("vastbase-connection-info-%d", connectionInfoDriverSequence.Add(1))
- sql.Register(driverName, &connectionInfoTestDriver{})
+ sql.Register(driverName, &connectionInfoTestDriver{nullSchema: len(nullSchema) > 0 && nullSchema[0]})
db, err := sql.Open(driverName, "")
if err != nil {
t.Fatal(err)
diff --git a/agents/drivers/vastbase-go/vastbase_metadata.go b/agents/drivers/vastbase-go/vastbase_metadata.go
index 7f8aec7964..bf3d74f18e 100644
--- a/agents/drivers/vastbase-go/vastbase_metadata.go
+++ b/agents/drivers/vastbase-go/vastbase_metadata.go
@@ -153,13 +153,14 @@ func (s *server) connectionInfo() (map[string]any, error) {
if err != nil {
return nil, err
}
- var database, username, version, schema string
+ var database, username, version string
+ var schema sql.NullString
err = db.QueryRow("SELECT current_database(), current_user, version(), current_schema()").Scan(&database, &username, &version, &schema)
if err != nil {
return nil, err
}
return map[string]any{
- "database": database, "username": username, "version": version, "schema": schema,
+ "database": database, "username": username, "version": version, "schema": schema.String,
"compatibilityMode": s.mode.compatibilityMode, "compatibilityModeRaw": s.mode.compatibilityModeRaw,
"mysql_compat_mode": s.mode.mysqlCompat,
"identifierQuote": s.identifierQuote(),