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): align index discovery and constraint owner matching

efeire563a0306e859
diff --git a/agents/drivers/oracle-go/main.go b/agents/drivers/oracle-go/main.go
index c64a40e599..1e249d6b10 100644
--- a/agents/drivers/oracle-go/main.go
+++ b/agents/drivers/oracle-go/main.go
@@ -3770,6 +3770,7 @@ WHERE i.TABLE_OWNER = :1
AND c.TABLE_NAME = :4
AND c.CONSTRAINT_TYPE IN ('P', 'U')
AND c.INDEX_NAME IS NOT NULL
+ AND c.INDEX_OWNER = i.OWNER
)
ORDER BY i.INDEX_NAME`
diff --git a/agents/drivers/oracle-go/main_test.go b/agents/drivers/oracle-go/main_test.go
index 07b883ecfb..f9da5008f9 100644
--- a/agents/drivers/oracle-go/main_test.go
+++ b/agents/drivers/oracle-go/main_test.go
@@ -2379,6 +2379,34 @@ func TestListObjectsSQLUsesSplitDictionaryQuery(t *testing.T) {
}
}
+func TestTableIndexDDLExclusionBindsConstraintIndexOwner(t *testing.T) {
+ for _, fromConnection := range []bool{false, true} {
+ t.Run(fmt.Sprint(fromConnection), func(t *testing.T) {
+ ddl := `CREATE INDEX OTHER.IX ON APP.T(ID)`
+ db, scripted := openOracleViewSourceTestDB(t, []oracleViewSourceQueryStep{
+ {queryContains: "c.INDEX_OWNER = i.OWNER", args: []driver.Value{"APP", "T", "APP", "T"}, columns: []string{"DDL"}, rows: [][]driver.Value{{ddl}}},
+ })
+ var result []string
+ var err error
+ if fromConnection {
+ conn, connectErr := db.Conn(context.Background())
+ if connectErr != nil {
+ t.Fatal(connectErr)
+ }
+ defer conn.Close()
+ result, err = loadTableIndexDDLsFromConn(conn, "APP", "T")
+ } else {
+ s := newServer()
+ s.db = db
+ result, err = s.loadTableIndexDDLs("APP", "T")
+ }
+ if err != nil || len(result) != 1 || result[0] != ddl || scripted.next != len(scripted.steps) {
+ t.Fatalf("exact owner query failed: result=%v error=%v queries=%d", result, err, scripted.next)
+ }
+ })
+ }
+}
+
func TestSchemaIndexObjectsPreserveBothOwnersThroughRPC(t *testing.T) {
db, scripted := openOracleViewSourceTestDB(t, []oracleViewSourceQueryStep{
{queryContains: "SYS_CONTEXT('USERENV', 'SESSION_USER')", args: []driver.Value{}, rows: [][]driver.Value{{"APP"}}},
diff --git a/crates/dbx-core/src/schema/mod.rs b/crates/dbx-core/src/schema/mod.rs
index 55d854bf31..c9dbb1d47e 100644
--- a/crates/dbx-core/src/schema/mod.rs
+++ b/crates/dbx-core/src/schema/mod.rs
@@ -12613,7 +12613,6 @@ fn oracle_list_objects_sql_for_owner(owner: &str, type_owner: &str) -> String {
FROM all_objects o LEFT JOIN all_indexes i ON o.object_type = 'INDEX' AND i.owner = o.owner AND i.index_name = o.object_name \
WHERE ((o.owner = {owner} AND o.object_type IN ('TABLE', 'VIEW', 'PROCEDURE', 'FUNCTION', 'TRIGGER', 'SEQUENCE', 'PACKAGE', 'PACKAGE BODY', 'INDEX')) \
OR (o.owner = {type_owner} AND o.object_type IN ('TYPE', 'TYPE BODY'))) \
- AND (o.object_type <> 'INDEX' OR i.generated = 'N' OR i.generated IS NULL) \
ORDER BY CASE o.object_type WHEN 'TABLE' THEN 0 WHEN 'VIEW' THEN 1 WHEN 'PROCEDURE' THEN 2 WHEN 'FUNCTION' THEN 3 WHEN 'SEQUENCE' THEN 4 WHEN 'PACKAGE' THEN 5 WHEN 'PACKAGE BODY' THEN 6 ELSE 7 END, o.object_name, o.object_type"
)
}