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): resolve current schema on the manual transaction session

Jeff1f7623e7f597
diff --git a/agents/drivers/oracle-go/main.go b/agents/drivers/oracle-go/main.go
index 2463bd34a7..e852bd984e 100644
--- a/agents/drivers/oracle-go/main.go
+++ b/agents/drivers/oracle-go/main.go
@@ -1698,12 +1698,23 @@ func oracleListSQLWithVisibleSchemas(baseSQL string, visibleSchemas []string) (s
}
func (s *server) currentSchema() (string, error) {
+ const sqlText = "SELECT SYS_CONTEXT('USERENV', 'CURRENT_SCHEMA') FROM DUAL"
+ var schema string
+ // CURRENT_SCHEMA is per Oracle session. A manual transaction sets it only on
+ // its pinned connection and skips per-statement setSchema, so a pooled
+ // session would report the login user's schema and resolve unqualified
+ // tables against the wrong owner (#11258).
+ if s.manualTx != nil {
+ if err := s.manualTx.QueryRow(sqlText).Scan(&schema); err != nil {
+ return "", err
+ }
+ return strings.ToUpper(schema), nil
+ }
db, err := s.requireDB()
if err != nil {
return "", err
}
- var schema string
- if err := db.QueryRow("SELECT SYS_CONTEXT('USERENV', 'CURRENT_SCHEMA') FROM DUAL").Scan(&schema); err != nil {
+ if err := db.QueryRow(sqlText).Scan(&schema); err != nil {
return "", err
}
return strings.ToUpper(schema), nil
diff --git a/agents/drivers/oracle-go/main_test.go b/agents/drivers/oracle-go/main_test.go
index a5a6cb4891..f10f577efe 100644
--- a/agents/drivers/oracle-go/main_test.go
+++ b/agents/drivers/oracle-go/main_test.go
@@ -3901,6 +3901,29 @@ func TestManualTransactionSkipsPerStatementSetSchema(t *testing.T) {
}
}
+func TestManualTransactionCurrentSchemaUsesPinnedSession(t *testing.T) {
+ db, _ := openOracleManualTxTestDB(t)
+ // A second pooled session that never ran ALTER SESSION SET CURRENT_SCHEMA
+ // still reports the login user's schema.
+ db.SetMaxOpenConns(2)
+ s := newServer()
+ s.db = db
+
+ if err := s.beginManualTransaction("APP_TEST"); err != nil {
+ t.Fatalf("begin: %v", err)
+ }
+ schema, err := s.normalizeSchema("")
+ if err != nil {
+ t.Fatalf("normalizeSchema: %v", err)
+ }
+ if schema != "APP_TEST" {
+ t.Fatalf("normalizeSchema(\"\") during manual tx = %q, want APP_TEST", schema)
+ }
+ if err := s.rollbackManualTransaction(); err != nil {
+ t.Fatalf("rollback: %v", err)
+ }
+}
+
func TestManualTransactionDisconnectRollsBack(t *testing.T) {
db, driver := openOracleManualTxTestDB(t)
s := newServer()
@@ -4003,6 +4026,7 @@ func (d *oracleManualTxDriver) Open(string) (driver.Conn, error) {
type oracleManualTxConn struct {
driver *oracleManualTxDriver
closed bool
+ schema string
}
func (c *oracleManualTxConn) Prepare(string) (driver.Stmt, error) {
@@ -4036,6 +4060,9 @@ func (c *oracleManualTxConn) ExecContext(_ context.Context, query string, _ []dr
c.driver.mu.Lock()
defer c.driver.mu.Unlock()
c.driver.execs = append(c.driver.execs, query)
+ if schema, ok := strings.CutPrefix(query, "ALTER SESSION SET CURRENT_SCHEMA = "); ok {
+ c.schema = strings.Trim(schema, `"`)
+ }
return driver.RowsAffected(1), nil
}
@@ -4043,6 +4070,16 @@ func (c *oracleManualTxConn) QueryContext(_ context.Context, query string, _ []d
c.driver.mu.Lock()
defer c.driver.mu.Unlock()
c.driver.queries = append(c.driver.queries, query)
+ if strings.Contains(query, "'CURRENT_SCHEMA'") {
+ schema := c.schema
+ if schema == "" {
+ schema = "LOGIN_USER"
+ }
+ return &oracleManualTxRows{
+ columns: []string{"SCHEMA"},
+ values: [][]driver.Value{{schema}},
+ }, nil
+ }
return &oracleManualTxRows{
columns: []string{"A"},
values: [][]driver.Value{{int64(1)}},