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(oracle): provide connection info for native jobs (#13769)

zipg1911bd5930be
diff --git a/agents/drivers/oracle-go/connection_info.go b/agents/drivers/oracle-go/connection_info.go
new file mode 100644
index 0000000000..4812e1b02b
--- /dev/null
+++ b/agents/drivers/oracle-go/connection_info.go
@@ -0,0 +1,31 @@
+package main
+
+import "strings"
+
+// Match the JDBC connection_info contract used to open native job contexts.
+// Version metadata is optional: dictionary visibility must not prevent the
+// caller from checking the session user and reading its own jobs.
+func (s *server) connectionInfo() (map[string]any, error) {
+ if _, err := s.requireDB(); err != nil {
+ return nil, err
+ }
+ info := map[string]string{
+ "productName": "Oracle",
+ "unquotedIdentifierCase": "upper",
+ "quotedIdentifierCase": "mixed",
+ }
+ for _, query := range oracleDatabaseVersionQueries {
+ rows, err := s.queryRowsWithTimeout(query, nil, int(oracleDatabaseVersionProbeTimeout.Seconds()))
+ if err != nil {
+ continue
+ }
+ var version string
+ valid := rows.Next() && rows.Scan(&version) == nil && rows.Err() == nil
+ s.closeRows(rows)
+ if valid && strings.TrimSpace(version) != "" {
+ info["productVersion"] = strings.TrimSpace(version)
+ break
+ }
+ }
+ return map[string]any{"identifierQuote": `"`, "databaseInfo": info}, nil
+}
diff --git a/agents/drivers/oracle-go/connection_info_test.go b/agents/drivers/oracle-go/connection_info_test.go
new file mode 100644
index 0000000000..7cc2e15a9b
--- /dev/null
+++ b/agents/drivers/oracle-go/connection_info_test.go
@@ -0,0 +1,80 @@
+package main
+
+import (
+ "database/sql/driver"
+ "encoding/json"
+ "testing"
+
+ "github.com/sijms/go-ora/v2/network"
+)
+
+func TestConnectionInfoRPCOpensNativeJobIdentity(t *testing.T) {
+ db, scripted := openOracleViewSourceTestDB(t, []oracleViewSourceQueryStep{
+ {queryContains: "PRODUCT_COMPONENT_VERSION", args: []driver.Value{}, columns: []string{"VERSION"}, rows: [][]driver.Value{{"11.2.0.2.0"}}},
+ {queryContains: "SELECT USER AS DBX_SESSION_USER FROM DUAL", args: []driver.Value{}, columns: []string{"DBX_SESSION_USER"}, rows: [][]driver.Value{{"Job_Owner"}}},
+ })
+ s := newServer()
+ s.db = db
+ runtime := newRuntimeServer()
+ runtime.sessions["native-jobs"] = &agentSession{server: s}
+ // Exercise the real multi-session RPC corridor, not a replacement handler.
+ resp, shutdown := runtime.handleLine(`{"id":1,"method":"connection_info","params":{"agentSessionId":"native-jobs"}}`)
+ if shutdown || resp.Error != nil {
+ t.Fatalf("native job connection_info failed: %+v", resp)
+ }
+ encoded, err := json.Marshal(resp.Result)
+ if err != nil {
+ t.Fatal(err)
+ }
+ var result struct {
+ IdentifierQuote string `json:"identifierQuote"`
+ DatabaseInfo map[string]string `json:"databaseInfo"`
+ }
+ if err := json.Unmarshal(encoded, &result); err != nil {
+ t.Fatal(err)
+ }
+ if result.IdentifierQuote != `"` || result.DatabaseInfo["productName"] != "Oracle" || result.DatabaseInfo["productVersion"] != "11.2.0.2.0" || result.DatabaseInfo["unquotedIdentifierCase"] != "upper" || result.DatabaseInfo["quotedIdentifierCase"] != "mixed" {
+ t.Fatalf("wrong connection_info contract: %s", encoded)
+ }
+ resp, shutdown = runtime.handleLine(`{"id":2,"method":"execute_query","params":{"agentSessionId":"native-jobs","sql":"SELECT USER AS DBX_SESSION_USER FROM DUAL"}}`)
+ if shutdown || resp.Error != nil || scripted.next != 2 {
+ t.Fatalf("native job session user read failed: %+v", resp)
+ }
+ query, ok := resp.Result.(queryResult)
+ if !ok || len(query.Rows) != 1 || query.Rows[0][0] != "Job_Owner" {
+ t.Fatalf("wrong session identity: %+v", resp.Result)
+ }
+}
+
+func TestConnectionInfoVersionVisibilityIsOptional(t *testing.T) {
+ for _, fallback := range []bool{false, true} {
+ t.Run(map[bool]string{false: "unavailable", true: "banner-fallback"}[fallback], func(t *testing.T) {
+ last := oracleViewSourceQueryStep{queryContains: "V$VERSION", args: []driver.Value{}, err: network.NewOracleError(942)}
+ if fallback {
+ last.err = nil
+ last.columns = []string{"BANNER"}
+ last.rows = [][]driver.Value{{"Oracle Database 19c Enterprise Edition Release 19.0.0.0.0 - Production"}}
+ }
+ db, scripted := openOracleViewSourceTestDB(t, []oracleViewSourceQueryStep{
+ {queryContains: "PRODUCT_COMPONENT_VERSION", args: []driver.Value{}, err: network.NewOracleError(1031)}, last,
+ })
+ s := newServer()
+ s.db = db
+ info, err := s.connectionInfo()
+ if err != nil || scripted.next != 2 {
+ t.Fatalf("optional version metadata blocked connection_info: %v", err)
+ }
+ metadata := info["databaseInfo"].(map[string]string)
+ if metadata["productName"] != "Oracle" || (metadata["productVersion"] != "") != fallback {
+ t.Fatalf("wrong fallback metadata: %v", metadata)
+ }
+ })
+ }
+}
+
+func TestConnectionInfoRequiresConnectedSession(t *testing.T) {
+ resp, shutdown := newServer().handleLine(`{"id":1,"method":"connection_info","params":{}}`)
+ if shutdown || resp.Error == nil || resp.Error.Message != "agent is not connected" {
+ t.Fatalf("disconnected connection_info should fail: %+v", resp)
+ }
+}
diff --git a/agents/drivers/oracle-go/main.go b/agents/drivers/oracle-go/main.go
index 151df21a1c..37af525878 100644
--- a/agents/drivers/oracle-go/main.go
+++ b/agents/drivers/oracle-go/main.go
@@ -44,7 +44,7 @@ const oracleDatabaseVersionProbeTimeout = 3 * time.Second
const oracleDatabaseVersionSQL = `
SELECT VERSION
FROM PRODUCT_COMPONENT_VERSION
-WHERE PRODUCT LIKE 'Oracle Database%'
+WHERE PRODUCT LIKE 'Oracle%Database%'
AND ROWNUM = 1`
const oracleDisableSegmentAttributesSQL = `BEGIN DBMS_METADATA.SET_TRANSFORM_PARAM(DBMS_METADATA.SESSION_TRANSFORM, 'SEGMENT_ATTRIBUTES', FALSE); END;`
@@ -59,7 +59,7 @@ var (
oracleNotNullConstraintRegexp = regexp.MustCompile(`(?i)^\s*\(*\s*(?:"((?:[^"]|"")*)"|([A-Z0-9_$#]+))\s+IS\s+NOT\s+NULL\s*\)*\s*$`)
oracleDatabaseVersionQueries = []string{
oracleDatabaseVersionSQL,
- `SELECT BANNER FROM V$VERSION WHERE BANNER LIKE 'Oracle Database%' AND ROWNUM = 1`,
+ `SELECT BANNER FROM V$VERSION WHERE BANNER LIKE 'Oracle%Database%' AND ROWNUM = 1`,
}
oracleStringConverters = map[int]converters.IStringConverter{
oracleCharsetZHS32GB18030: oracleGB18030Converter{},
@@ -1132,6 +1132,9 @@ func (s *server) dispatch(method string, params map[string]json.RawMessage) (any
return nil, false, errors.New("not connected")
}
return map[string]bool{"ok": true}, false, pingDB(s.db, 5*time.Second)
+ case "connection_info":
+ result, err := s.connectionInfo()
+ return result, false, err
case "list_databases":
result, err := s.listDatabases()
return result, false, err