universal-db-mcp 2.10.1 → 2.12.0

package/README.md

@@ -59,7 +59,9 @@ AI: Let me query that for you...
 - **Intelligent Caching** - Schema caching with configurable TTL for blazing-fast performance
 - **Batch Query Optimization** - Up to 100x faster schema retrieval for large databases
 - **Schema Enhancement** - Table comments, implicit relationship inference for better Text2SQL accuracy
+- **Multi-Schema Support** - Automatic discovery of all user schemas (PostgreSQL, SQL Server, Oracle, DM, and more)
 - **Data Masking** - Automatic sensitive data protection (phone, email, ID card, bank card, etc.)
+- **Connection Stability** - Connection pooling, TCP Keep-Alive, and automatic reconnection for long-running sessions
 
 ### Performance Improvements
 
@@ -236,6 +238,7 @@ See [Dify Integration Guide](./docs/integrations/DIFY.md) for detailed setup ins
 │  ┌──────────────────────────────────────────────────────────────────┐  │
 │  │                    Database Adapter Layer                         │  │
 │  │  MySQL │ PostgreSQL │ Redis │ Oracle │ MongoDB │ SQLite │ ...    │  │
+│  │        (Connection Pool + TCP Keep-Alive + Auto-Retry)           │  │
 │  └──────────────────────────────────────────────────────────────────┘  │
 │                                                                          │
 └─────────────────────────────────────────────────────────────────────────┘

package/README.zh-CN.md

@@ -58,7 +58,9 @@ AI: 让我帮你查询一下...
 - **智能缓存** - Schema 缓存支持可配置的 TTL，性能极速
 - **批量查询优化** - 大型数据库的 Schema 获取速度提升高达 100 倍
 - **Schema 增强** - 表注释、隐式关系推断，提升 Text2SQL 准确性
+- **多 Schema 支持** - 自动发现所有用户 Schema（PostgreSQL、SQL Server、Oracle、达梦等）
 - **数据脱敏** - 自动保护敏感数据（手机号、邮箱、身份证、银行卡等）
+- **连接稳定性** - 连接池、TCP Keep-Alive、断线自动重试，保障长时间会话稳定运行
 
 ### 性能提升
 
@@ -235,6 +237,7 @@ POST http://localhost:3000/mcp
 │  ┌──────────────────────────────────────────────────────────────────┐  │
 │  │                      数据库适配器层                                │  │
 │  │  MySQL │ PostgreSQL │ Redis │ Oracle │ MongoDB │ SQLite │ ...    │  │
+│  │          （连接池 + TCP Keep-Alive + 断线自动重试）               │  │
 │  └──────────────────────────────────────────────────────────────────┘  │
 │                                                                          │
 └─────────────────────────────────────────────────────────────────────────┘

package/dist/adapters/dm.d.ts

@@ -5,10 +5,14 @@
  * dmdb 驱动会作为可选依赖自动安装
  *
  * 性能优化：使用批量查询获取 Schema 信息，避免 N+1 查询问题
+ *
+ * 连接管理：使用心跳保活 + 断线自动重连 + 操作自动重试，确保长连接稳定性
  */
 import type { DbAdapter, QueryResult, SchemaInfo } from '../types/adapter.js';
 export declare class DMAdapter implements DbAdapter {
     private connection;
+    private heartbeatTimer;
+    private connectionConfig;
     private config;
     constructor(config: {
         host: string;
@@ -17,6 +21,11 @@ export declare class DMAdapter implements DbAdapter {
         password?: string;
         database?: string;
     });
+    private isConnectionError;
+    private reconnect;
+    private startHeartbeat;
+    private stopHeartbeat;
+    private withRetry;
     /**
      * 连接到达梦数据库
      */
@@ -41,10 +50,12 @@ export declare class DMAdapter implements DbAdapter {
      * 因此需要按索引位置访问数据。
      */
     getSchema(): Promise<SchemaInfo>;
+    private _getSchemaImpl;
     /**
      * 按索引获取对象的值（dmdb 驱动返回的列名是数字索引）
      */
     private getValueByIndex;
+    private makeTableKey;
     /**
      * 组装 Schema 信息（处理 dmdb 驱动返回的数字索引列名）
      */

package/dist/adapters/dm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dm.d.ts","sourceRoot":"","sources":["../../src/adapters/dm.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EACV,SAAS,EACT,WAAW,EACX,UAAU,EAMX,MAAM,qBAAqB,CAAC;AAyB7B,qBAAa,SAAU,YAAW,SAAS;IACzC,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,MAAM,CAMZ;gBAEU,MAAM,EAAE;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;IAID;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC9B;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAWjC;;OAEG;IACG,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;IAkE3E;;;;;;;;;;OAUG;IACG,SAAS,IAAI,OAAO,CAAC,UAAU,CAAC;IAkItC;;OAEG;IACH,OAAO,CAAC,eAAe;IAiBvB;;OAEG;IACH,OAAO,CAAC,6BAA6B;IAiQrC;;OAEG;IACH,OAAO,CAAC,YAAY;IAuEpB;;OAEG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;CA+BzC"}
+{"version":3,"file":"dm.d.ts","sourceRoot":"","sources":["../../src/adapters/dm.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EACV,SAAS,EACT,WAAW,EACX,UAAU,EAMX,MAAM,qBAAqB,CAAC;AAyB7B,qBAAa,SAAU,YAAW,SAAS;IACzC,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,cAAc,CAA+C;IACrE,OAAO,CAAC,gBAAgB,CAAa;IACrC,OAAO,CAAC,MAAM,CAMZ;gBAEU,MAAM,EAAE;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;IAID,OAAO,CAAC,iBAAiB;YAKX,SAAS;IAWvB,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,aAAa;YAIP,SAAS;IAOvB;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAqC9B;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAYjC;;OAEG;IACG,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;IAkE3E;;;;;;;;;;OAUG;IACG,SAAS,IAAI,OAAO,CAAC,UAAU,CAAC;YAcxB,cAAc;IAkI5B;;OAEG;IACH,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,YAAY;IAIpB;;OAEG;IACH,OAAO,CAAC,6BAA6B;IAyRrC;;OAEG;IACH,OAAO,CAAC,YAAY;IAuEpB;;OAEG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;CA+BzC"}

package/dist/adapters/dm.js

@@ -5,6 +5,8 @@
  * dmdb 驱动会作为可选依赖自动安装
  *
  * 性能优化：使用批量查询获取 Schema 信息，避免 N+1 查询问题
+ *
+ * 连接管理：使用心跳保活 + 断线自动重连 + 操作自动重试，确保长连接稳定性
  */
 import { isWriteOperation as checkWriteOperation } from '../utils/safety.js';
 // 动态导入 dmdb，因为它是可选依赖
@@ -27,10 +29,64 @@ async function loadDMDB() {
 }
 export class DMAdapter {
     connection = null;
+    heartbeatTimer = null;
+    connectionConfig = null;
     config;
     constructor(config) {
         this.config = config;
     }
+    isConnectionError(error) {
+        const msg = String(error?.message || '');
+        return /closed|ECONNRESET|EPIPE|ETIMEDOUT|ECONNREFUSED|网络|连接/.test(msg);
+    }
+    async reconnect() {
+        try {
+            if (this.connection) {
+                try {
+                    await this.connection.close();
+                }
+                catch { }
+                this.connection = null;
+            }
+            const DM = await loadDMDB();
+            this.connection = await DM.getConnection(this.connectionConfig);
+            console.error('达梦数据库重连成功');
+        }
+        catch (error) {
+            console.error('达梦数据库重连失败:', error instanceof Error ? error.message : String(error));
+        }
+    }
+    startHeartbeat() {
+        this.stopHeartbeat();
+        this.heartbeatTimer = setInterval(async () => {
+            try {
+                if (this.connection) {
+                    await this.connection.execute('SELECT 1 FROM DUAL', []);
+                }
+            }
+            catch {
+                await this.reconnect();
+            }
+        }, 30000);
+    }
+    stopHeartbeat() {
+        if (this.heartbeatTimer) {
+            clearInterval(this.heartbeatTimer);
+            this.heartbeatTimer = null;
+        }
+    }
+    async withRetry(fn) {
+        try {
+            return await fn();
+        }
+        catch (error) {
+            if (this.isConnectionError(error)) {
+                await this.reconnect();
+                return await fn();
+            }
+            throw error;
+        }
+    }
     /**
      * 连接到达梦数据库
      */
@@ -50,8 +106,10 @@ export class DMAdapter {
                 loginEncrypt: false,
             };
             this.connection = await DM.getConnection(connectionConfig);
+            this.connectionConfig = connectionConfig;
             // 测试连接
             await this.connection.execute('SELECT 1 FROM DUAL', []);
+            this.startHeartbeat();
         }
         catch (error) {
             // 翻译常见错误
@@ -69,6 +127,7 @@ export class DMAdapter {
      * 断开数据库连接
      */
     async disconnect() {
+        this.stopHeartbeat();
         if (this.connection) {
             try {
                 await this.connection.close();
@@ -94,9 +153,9 @@ export class DMAdapter {
                 cleanQuery = cleanQuery.slice(0, -1).trim();
             }
             // 执行查询
-            const result = await this.connection.execute(cleanQuery, params || [], {
+            const result = await this.withRetry(() => this.connection.execute(cleanQuery, params || [], {
                 autoCommit: false,
-            });
+            }));
             const executionTime = Date.now() - startTime;
             // 处理查询结果
             if (result.rows && result.rows.length > 0) {
@@ -159,85 +218,97 @@ export class DMAdapter {
             throw new Error('数据库未连接');
         }
         try {
-            // 获取达梦数据库版本
-            const versionResult = await this.connection.execute(`SELECT BANNER FROM V$VERSION WHERE ROWNUM = 1`, []);
-            const version = versionResult.rows?.[0]
-                ? this.getValueByIndex(versionResult.rows[0], 0)
-                : 'unknown';
-            // 获取当前 schema（在达梦中，schema 通常与用户名相同）
-            const schemaResult = await this.connection.execute(`SELECT SYS_CONTEXT('USERENV', 'CURRENT_SCHEMA') FROM DUAL`, []);
-            const currentSchema = schemaResult.rows?.[0]
-                ? this.getValueByIndex(schemaResult.rows[0], 0)
-                : '';
-            // 获取当前用户（作为备选）
-            const userResult = await this.connection.execute('SELECT USER FROM DUAL', []);
-            const currentUser = userResult.rows?.[0]
-                ? this.getValueByIndex(userResult.rows[0], 0)
-                : '';
-            // schema 名称：优先使用当前 schema，其次使用当前用户，最后使用配置的用户名
-            const schemaName = (currentSchema || currentUser || this.config.user || '').toUpperCase();
-            const databaseName = schemaName || 'unknown';
-            // 获取所有表的列信息
-            // 列顺序: 0=TABLE_NAME, 1=COLUMN_NAME, 2=DATA_TYPE, 3=DATA_LENGTH,
-            //        4=DATA_PRECISION, 5=DATA_SCALE, 6=NULLABLE, 7=DATA_DEFAULT, 8=COLUMN_ID
-            const allColumnsResult = await this.connection.execute(`SELECT TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION,
+            return await this.withRetry(() => this._getSchemaImpl());
+        }
+        catch (error) {
+            throw new Error(`获取数据库结构失败: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    async _getSchemaImpl() {
+        // 获取达梦数据库版本
+        const versionResult = await this.connection.execute(`SELECT BANNER FROM V$VERSION WHERE ROWNUM = 1`, []);
+        const version = versionResult.rows?.[0]
+            ? this.getValueByIndex(versionResult.rows[0], 0)
+            : 'unknown';
+        // 获取当前 schema（在达梦中，schema 通常与用户名相同）
+        const schemaResult = await this.connection.execute(`SELECT SYS_CONTEXT('USERENV', 'CURRENT_SCHEMA') FROM DUAL`, []);
+        const currentSchema = schemaResult.rows?.[0]
+            ? this.getValueByIndex(schemaResult.rows[0], 0)
+            : '';
+        // 获取当前用户（作为备选）
+        const userResult = await this.connection.execute('SELECT USER FROM DUAL', []);
+        const currentUser = userResult.rows?.[0]
+            ? this.getValueByIndex(userResult.rows[0], 0)
+            : '';
+        // schema 名称：优先使用当前 schema，其次使用当前用户，最后使用配置的用户名
+        const schemaName = (currentSchema || currentUser || this.config.user || '').toUpperCase();
+        const databaseName = schemaName || 'unknown';
+        // 获取所有表的列信息
+        // 列顺序: 0=OWNER, 1=TABLE_NAME, 2=COLUMN_NAME, 3=DATA_TYPE, 4=DATA_LENGTH,
+        //        5=DATA_PRECISION, 6=DATA_SCALE, 7=NULLABLE, 8=DATA_DEFAULT, 9=COLUMN_ID
+        const allColumnsResult = await this.connection.execute(`SELECT OWNER, TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION,
                 DATA_SCALE, NULLABLE, DATA_DEFAULT, COLUMN_ID
-         FROM USER_TAB_COLUMNS
-         ORDER BY TABLE_NAME, COLUMN_ID`, []);
-            // 获取所有列注释
-            // 列顺序: 0=TABLE_NAME, 1=COLUMN_NAME, 2=COMMENTS
-            const allCommentsResult = await this.connection.execute(`SELECT TABLE_NAME, COLUMN_NAME, COMMENTS
-         FROM USER_COL_COMMENTS
-         WHERE COMMENTS IS NOT NULL`, []);
-            // 获取所有主键信息
-            // 列顺序: 0=TABLE_NAME, 1=COLUMN_NAME, 2=POSITION
-            const allPrimaryKeysResult = await this.connection.execute(`SELECT cons.TABLE_NAME, cols.COLUMN_NAME, cols.POSITION
-         FROM USER_CONSTRAINTS cons
-         JOIN USER_CONS_COLUMNS cols
-           ON cons.CONSTRAINT_NAME = cols.CONSTRAINT_NAME
+         FROM ALL_TAB_COLUMNS
+         WHERE OWNER NOT IN ('SYS', 'SYSTEM', 'SYSAUDITOR', 'SYSSSO', 'SYSDBA', 'CTISYS')
+         ORDER BY OWNER, TABLE_NAME, COLUMN_ID`, []);
+        // 获取所有列注释
+        // 列顺序: 0=OWNER, 1=TABLE_NAME, 2=COLUMN_NAME, 3=COMMENTS
+        const allCommentsResult = await this.connection.execute(`SELECT OWNER, TABLE_NAME, COLUMN_NAME, COMMENTS
+         FROM ALL_COL_COMMENTS
+         WHERE OWNER NOT IN ('SYS', 'SYSTEM', 'SYSAUDITOR', 'SYSSSO', 'SYSDBA', 'CTISYS')
+           AND COMMENTS IS NOT NULL`, []);
+        // 获取所有主键信息
+        // 列顺序: 0=OWNER, 1=TABLE_NAME, 2=COLUMN_NAME, 3=POSITION
+        const allPrimaryKeysResult = await this.connection.execute(`SELECT cons.OWNER, cons.TABLE_NAME, cols.COLUMN_NAME, cols.POSITION
+         FROM ALL_CONSTRAINTS cons
+         JOIN ALL_CONS_COLUMNS cols
+           ON cons.CONSTRAINT_NAME = cols.CONSTRAINT_NAME AND cons.OWNER = cols.OWNER
          WHERE cons.CONSTRAINT_TYPE = 'P'
-         ORDER BY cons.TABLE_NAME, cols.POSITION`, []);
-            // 获取所有索引信息
-            // 列顺序: 0=TABLE_NAME, 1=INDEX_NAME, 2=UNIQUENESS, 3=COLUMN_NAME, 4=COLUMN_POSITION
-            const allIndexesResult = await this.connection.execute(`SELECT i.TABLE_NAME, i.INDEX_NAME, i.UNIQUENESS, ic.COLUMN_NAME, ic.COLUMN_POSITION
-         FROM USER_INDEXES i
-         JOIN USER_IND_COLUMNS ic
-           ON i.INDEX_NAME = ic.INDEX_NAME
-         ORDER BY i.TABLE_NAME, i.INDEX_NAME, ic.COLUMN_POSITION`, []);
-            // 获取所有表的行数估算和表注释
-            // 列顺序: 0=TABLE_NAME, 1=NUM_ROWS, 2=TABLE_COMMENT
-            const allStatsResult = await this.connection.execute(`SELECT t.TABLE_NAME, t.NUM_ROWS, c.COMMENTS AS TABLE_COMMENT
-         FROM USER_TABLES t
-         LEFT JOIN USER_TAB_COMMENTS c ON t.TABLE_NAME = c.TABLE_NAME`, []);
-            // 获取所有外键信息
-            // 列顺序: 0=TABLE_NAME, 1=CONSTRAINT_NAME, 2=COLUMN_NAME, 3=REFERENCED_TABLE, 4=REFERENCED_COLUMN, 5=DELETE_RULE, 6=POSITION
-            let allForeignKeys = [];
-            try {
-                const allForeignKeysResult = await this.connection.execute(`SELECT
+           AND cons.OWNER NOT IN ('SYS', 'SYSTEM', 'SYSAUDITOR', 'SYSSSO', 'SYSDBA', 'CTISYS')
+         ORDER BY cons.OWNER, cons.TABLE_NAME, cols.POSITION`, []);
+        // 获取所有索引信息
+        // 列顺序: 0=OWNER, 1=TABLE_NAME, 2=INDEX_NAME, 3=UNIQUENESS, 4=COLUMN_NAME, 5=COLUMN_POSITION
+        const allIndexesResult = await this.connection.execute(`SELECT i.OWNER, i.TABLE_NAME, i.INDEX_NAME, i.UNIQUENESS, ic.COLUMN_NAME, ic.COLUMN_POSITION
+         FROM ALL_INDEXES i
+         JOIN ALL_IND_COLUMNS ic
+           ON i.INDEX_NAME = ic.INDEX_NAME AND i.OWNER = ic.INDEX_OWNER
+         WHERE i.OWNER NOT IN ('SYS', 'SYSTEM', 'SYSAUDITOR', 'SYSSSO', 'SYSDBA', 'CTISYS')
+         ORDER BY i.OWNER, i.TABLE_NAME, i.INDEX_NAME, ic.COLUMN_POSITION`, []);
+        // 获取所有表的行数估算和表注释
+        // 列顺序: 0=OWNER, 1=TABLE_NAME, 2=NUM_ROWS, 3=TABLE_COMMENT
+        const allStatsResult = await this.connection.execute(`SELECT t.OWNER, t.TABLE_NAME, t.NUM_ROWS, c.COMMENTS AS TABLE_COMMENT
+         FROM ALL_TABLES t
+         LEFT JOIN ALL_TAB_COMMENTS c ON t.TABLE_NAME = c.TABLE_NAME AND t.OWNER = c.OWNER
+         WHERE t.OWNER NOT IN ('SYS', 'SYSTEM', 'SYSAUDITOR', 'SYSSSO', 'SYSDBA', 'CTISYS')`, []);
+        // 获取所有外键信息
+        // 列顺序: 0=OWNER, 1=TABLE_NAME, 2=CONSTRAINT_NAME, 3=COLUMN_NAME, 4=REFERENCED_TABLE,
+        //        5=REFERENCED_COLUMN, 6=DELETE_RULE, 7=REF_OWNER, 8=POSITION
+        let allForeignKeys = [];
+        try {
+            const allForeignKeysResult = await this.connection.execute(`SELECT
+            c.OWNER,
             c.TABLE_NAME,
             c.CONSTRAINT_NAME,
             cc.COLUMN_NAME,
             rc.TABLE_NAME AS REFERENCED_TABLE,
             rcc.COLUMN_NAME AS REFERENCED_COLUMN,
             c.DELETE_RULE,
+            rc.OWNER AS REF_OWNER,
             cc.POSITION
-          FROM USER_CONSTRAINTS c
-          JOIN USER_CONS_COLUMNS cc ON c.CONSTRAINT_NAME = cc.CONSTRAINT_NAME
-          JOIN USER_CONSTRAINTS rc ON c.R_CONSTRAINT_NAME = rc.CONSTRAINT_NAME
-          JOIN USER_CONS_COLUMNS rcc ON rc.CONSTRAINT_NAME = rcc.CONSTRAINT_NAME AND cc.POSITION = rcc.POSITION
+          FROM ALL_CONSTRAINTS c
+          JOIN ALL_CONS_COLUMNS cc ON c.CONSTRAINT_NAME = cc.CONSTRAINT_NAME AND c.OWNER = cc.OWNER
+          JOIN ALL_CONSTRAINTS rc ON c.R_CONSTRAINT_NAME = rc.CONSTRAINT_NAME AND c.R_OWNER = rc.OWNER
+          JOIN ALL_CONS_COLUMNS rcc ON rc.CONSTRAINT_NAME = rcc.CONSTRAINT_NAME AND rc.OWNER = rcc.OWNER AND cc.POSITION = rcc.POSITION
           WHERE c.CONSTRAINT_TYPE = 'R'
-          ORDER BY c.TABLE_NAME, c.CONSTRAINT_NAME, cc.POSITION`, []);
-                allForeignKeys = allForeignKeysResult.rows || [];
-            }
-            catch (error) {
-                // 外键查询失败时忽略，返回空数组
-                console.error('获取外键信息失败，跳过:', error instanceof Error ? error.message : String(error));
-            }
-            return this.assembleSchemaFromIndexedRows(databaseName, version, allColumnsResult.rows || [], allCommentsResult.rows || [], allPrimaryKeysResult.rows || [], allIndexesResult.rows || [], allStatsResult.rows || [], allForeignKeys);
+            AND c.OWNER NOT IN ('SYS', 'SYSTEM', 'SYSAUDITOR', 'SYSSSO', 'SYSDBA', 'CTISYS')
+          ORDER BY c.OWNER, c.TABLE_NAME, c.CONSTRAINT_NAME, cc.POSITION`, []);
+            allForeignKeys = allForeignKeysResult.rows || [];
         }
         catch (error) {
-            throw new Error(`获取数据库结构失败: ${error instanceof Error ? error.message : String(error)}`);
+            // 外键查询失败时忽略，返回空数组
+            console.error('获取外键信息失败，跳过:', error instanceof Error ? error.message : String(error));
         }
+        return this.assembleSchemaFromIndexedRows(databaseName, version, allColumnsResult.rows || [], allCommentsResult.rows || [], allPrimaryKeysResult.rows || [], allIndexesResult.rows || [], allStatsResult.rows || [], allForeignKeys, schemaName);
     }
     /**
      * 按索引获取对象的值（dmdb 驱动返回的列名是数字索引）
@@ -258,31 +329,38 @@ export class DMAdapter {
         const values = Object.values(obj);
         return values.length > index ? values[index] : undefined;
     }
+    makeTableKey(owner, tableName, currentUser) {
+        return owner.toUpperCase() === currentUser.toUpperCase() ? tableName : `${owner}.${tableName}`;
+    }
     /**
      * 组装 Schema 信息（处理 dmdb 驱动返回的数字索引列名）
      */
-    assembleSchemaFromIndexedRows(databaseName, version, allColumns, allComments, allPrimaryKeys, allIndexes, allStats, allForeignKeys) {
+    assembleSchemaFromIndexedRows(databaseName, version, allColumns, allComments, allPrimaryKeys, allIndexes, allStats, allForeignKeys, currentUser) {
         // 按表名分组列信息
-        // 列顺序: 0=TABLE_NAME, 1=COLUMN_NAME, 2=DATA_TYPE, 3=DATA_LENGTH,
-        //        4=DATA_PRECISION, 5=DATA_SCALE, 6=NULLABLE, 7=DATA_DEFAULT, 8=COLUMN_ID
+        // 列顺序: 0=OWNER, 1=TABLE_NAME, 2=COLUMN_NAME, 3=DATA_TYPE, 4=DATA_LENGTH,
+        //        5=DATA_PRECISION, 6=DATA_SCALE, 7=NULLABLE, 8=DATA_DEFAULT, 9=COLUMN_ID
         const columnsByTable = new Map();
+        const schemaByTable = new Map();
         for (const col of allColumns) {
-            const tableName = this.getValueByIndex(col, 0);
-            const columnName = this.getValueByIndex(col, 1);
-            const dataType = this.getValueByIndex(col, 2);
-            const dataLength = this.getValueByIndex(col, 3);
-            const dataPrecision = this.getValueByIndex(col, 4);
-            const dataScale = this.getValueByIndex(col, 5);
-            const nullable = this.getValueByIndex(col, 6);
-            const dataDefault = this.getValueByIndex(col, 7);
+            const owner = this.getValueByIndex(col, 0);
+            const tableName = this.getValueByIndex(col, 1);
+            const columnName = this.getValueByIndex(col, 2);
+            const dataType = this.getValueByIndex(col, 3);
+            const dataLength = this.getValueByIndex(col, 4);
+            const dataPrecision = this.getValueByIndex(col, 5);
+            const dataScale = this.getValueByIndex(col, 6);
+            const nullable = this.getValueByIndex(col, 7);
+            const dataDefault = this.getValueByIndex(col, 8);
             // 跳过无效数据
             if (!tableName || !columnName) {
                 continue;
             }
-            if (!columnsByTable.has(tableName)) {
-                columnsByTable.set(tableName, []);
+            const tableKey = this.makeTableKey(owner, tableName, currentUser);
+            if (!columnsByTable.has(tableKey)) {
+                columnsByTable.set(tableKey, []);
+                schemaByTable.set(tableKey, owner);
             }
-            columnsByTable.get(tableName).push({
+            columnsByTable.get(tableKey).push({
                 name: String(columnName).toLowerCase(),
                 type: this.formatDMType(dataType, dataLength, dataPrecision, dataScale),
                 nullable: nullable === 'Y',
@@ -290,24 +368,26 @@ export class DMAdapter {
             });
         }
         // 按表名分组列注释
-        // 列顺序: 0=TABLE_NAME, 1=COLUMN_NAME, 2=COMMENTS
+        // 列顺序: 0=OWNER, 1=TABLE_NAME, 2=COLUMN_NAME, 3=COMMENTS
         const commentsByTable = new Map();
         for (const comment of allComments) {
-            const tableName = this.getValueByIndex(comment, 0);
-            const columnName = this.getValueByIndex(comment, 1);
-            const comments = this.getValueByIndex(comment, 2);
+            const owner = this.getValueByIndex(comment, 0);
+            const tableName = this.getValueByIndex(comment, 1);
+            const columnName = this.getValueByIndex(comment, 2);
+            const comments = this.getValueByIndex(comment, 3);
             // 跳过无效数据
             if (!tableName || !columnName || !comments) {
                 continue;
             }
-            if (!commentsByTable.has(tableName)) {
-                commentsByTable.set(tableName, new Map());
+            const tableKey = this.makeTableKey(owner, tableName, currentUser);
+            if (!commentsByTable.has(tableKey)) {
+                commentsByTable.set(tableKey, new Map());
             }
-            commentsByTable.get(tableName).set(String(columnName).toLowerCase(), String(comments));
+            commentsByTable.get(tableKey).set(String(columnName).toLowerCase(), String(comments));
         }
         // 将注释添加到列信息中
-        for (const [tableName, columns] of columnsByTable.entries()) {
-            const tableComments = commentsByTable.get(tableName);
+        for (const [tableKey, columns] of columnsByTable.entries()) {
+            const tableComments = commentsByTable.get(tableKey);
             if (tableComments) {
                 for (const col of columns) {
                     if (tableComments.has(col.name)) {
@@ -317,28 +397,31 @@ export class DMAdapter {
             }
         }
         // 按表名分组主键信息
-        // 列顺序: 0=TABLE_NAME, 1=COLUMN_NAME, 2=POSITION
+        // 列顺序: 0=OWNER, 1=TABLE_NAME, 2=COLUMN_NAME, 3=POSITION
         const primaryKeysByTable = new Map();
         for (const pk of allPrimaryKeys) {
-            const tableName = this.getValueByIndex(pk, 0);
-            const columnName = this.getValueByIndex(pk, 1);
+            const owner = this.getValueByIndex(pk, 0);
+            const tableName = this.getValueByIndex(pk, 1);
+            const columnName = this.getValueByIndex(pk, 2);
             // 跳过无效数据
             if (!tableName || !columnName) {
                 continue;
             }
-            if (!primaryKeysByTable.has(tableName)) {
-                primaryKeysByTable.set(tableName, []);
+            const tableKey = this.makeTableKey(owner, tableName, currentUser);
+            if (!primaryKeysByTable.has(tableKey)) {
+                primaryKeysByTable.set(tableKey, []);
             }
-            primaryKeysByTable.get(tableName).push(String(columnName).toLowerCase());
+            primaryKeysByTable.get(tableKey).push(String(columnName).toLowerCase());
         }
         // 按表名分组索引信息
-        // 列顺序: 0=TABLE_NAME, 1=INDEX_NAME, 2=UNIQUENESS, 3=COLUMN_NAME, 4=COLUMN_POSITION
+        // 列顺序: 0=OWNER, 1=TABLE_NAME, 2=INDEX_NAME, 3=UNIQUENESS, 4=COLUMN_NAME, 5=COLUMN_POSITION
         const indexesByTable = new Map();
         for (const idx of allIndexes) {
-            const tableName = this.getValueByIndex(idx, 0);
-            const indexName = this.getValueByIndex(idx, 1);
-            const uniqueness = this.getValueByIndex(idx, 2);
-            const columnName = this.getValueByIndex(idx, 3);
+            const owner = this.getValueByIndex(idx, 0);
+            const tableName = this.getValueByIndex(idx, 1);
+            const indexName = this.getValueByIndex(idx, 2);
+            const uniqueness = this.getValueByIndex(idx, 3);
+            const columnName = this.getValueByIndex(idx, 4);
             // 跳过无效数据
             if (!tableName || !indexName || !columnName) {
                 continue;
@@ -348,10 +431,11 @@ export class DMAdapter {
             if (idxNameStr.includes('PK_') || idxNameStr.startsWith('INDEX') || idxNameStr.includes('SYS_')) {
                 continue;
             }
-            if (!indexesByTable.has(tableName)) {
-                indexesByTable.set(tableName, new Map());
+            const tableKey = this.makeTableKey(owner, tableName, currentUser);
+            if (!indexesByTable.has(tableKey)) {
+                indexesByTable.set(tableKey, new Map());
             }
-            const tableIndexes = indexesByTable.get(tableName);
+            const tableIndexes = indexesByTable.get(tableKey);
             if (!tableIndexes.has(indexName)) {
                 tableIndexes.set(indexName, {
                     columns: [],
@@ -361,41 +445,48 @@ export class DMAdapter {
             tableIndexes.get(indexName).columns.push(String(columnName).toLowerCase());
         }
         // 按表名分组行数统计
-        // 列顺序: 0=TABLE_NAME, 1=NUM_ROWS, 2=TABLE_COMMENT
+        // 列顺序: 0=OWNER, 1=TABLE_NAME, 2=NUM_ROWS, 3=TABLE_COMMENT
         const rowsByTable = new Map();
         const tableCommentsByTable = new Map();
         for (const stat of allStats) {
-            const tableName = this.getValueByIndex(stat, 0);
-            const numRows = this.getValueByIndex(stat, 1);
-            const tableComment = this.getValueByIndex(stat, 2);
+            const owner = this.getValueByIndex(stat, 0);
+            const tableName = this.getValueByIndex(stat, 1);
+            const numRows = this.getValueByIndex(stat, 2);
+            const tableComment = this.getValueByIndex(stat, 3);
             if (tableName) {
-                rowsByTable.set(tableName, Number(numRows) || 0);
+                const tableKey = this.makeTableKey(owner, tableName, currentUser);
+                rowsByTable.set(tableKey, Number(numRows) || 0);
                 if (tableComment) {
-                    tableCommentsByTable.set(tableName, tableComment);
+                    tableCommentsByTable.set(tableKey, tableComment);
                 }
             }
         }
         // 按表名分组外键信息
-        // 列顺序: 0=TABLE_NAME, 1=CONSTRAINT_NAME, 2=COLUMN_NAME, 3=REFERENCED_TABLE, 4=REFERENCED_COLUMN, 5=DELETE_RULE, 6=POSITION
+        // 列顺序: 0=OWNER, 1=TABLE_NAME, 2=CONSTRAINT_NAME, 3=COLUMN_NAME, 4=REFERENCED_TABLE,
+        //        5=REFERENCED_COLUMN, 6=DELETE_RULE, 7=REF_OWNER, 8=POSITION
         const foreignKeysByTable = new Map();
         const relationships = [];
         for (const fk of allForeignKeys) {
-            const tableName = this.getValueByIndex(fk, 0);
-            const constraintName = this.getValueByIndex(fk, 1);
-            const columnName = this.getValueByIndex(fk, 2);
-            const referencedTable = this.getValueByIndex(fk, 3);
-            const referencedColumn = this.getValueByIndex(fk, 4);
-            const deleteRule = this.getValueByIndex(fk, 5);
+            const owner = this.getValueByIndex(fk, 0);
+            const tableName = this.getValueByIndex(fk, 1);
+            const constraintName = this.getValueByIndex(fk, 2);
+            const columnName = this.getValueByIndex(fk, 3);
+            const referencedTable = this.getValueByIndex(fk, 4);
+            const referencedColumn = this.getValueByIndex(fk, 5);
+            const deleteRule = this.getValueByIndex(fk, 6);
+            const refOwner = this.getValueByIndex(fk, 7);
             if (!tableName || !constraintName)
                 continue;
-            if (!foreignKeysByTable.has(tableName)) {
-                foreignKeysByTable.set(tableName, new Map());
+            const tableKey = this.makeTableKey(owner, tableName, currentUser);
+            const refTableKey = this.makeTableKey(refOwner, referencedTable, currentUser);
+            if (!foreignKeysByTable.has(tableKey)) {
+                foreignKeysByTable.set(tableKey, new Map());
             }
-            const tableForeignKeys = foreignKeysByTable.get(tableName);
+            const tableForeignKeys = foreignKeysByTable.get(tableKey);
             if (!tableForeignKeys.has(constraintName)) {
                 tableForeignKeys.set(constraintName, {
                     columns: [],
-                    referencedTable: String(referencedTable).toLowerCase(),
+                    referencedTable: String(refTableKey).toLowerCase(),
                     referencedColumns: [],
                     onDelete: deleteRule,
                 });
@@ -405,10 +496,10 @@ export class DMAdapter {
             fkInfo.referencedColumns.push(String(referencedColumn).toLowerCase());
         }
         // 生成全局关系视图
-        for (const [tableName, tableForeignKeys] of foreignKeysByTable.entries()) {
+        for (const [tableKey, tableForeignKeys] of foreignKeysByTable.entries()) {
             for (const [constraintName, fkInfo] of tableForeignKeys.entries()) {
                 relationships.push({
-                    fromTable: String(tableName).toLowerCase(),
+                    fromTable: String(tableKey).toLowerCase(),
                     fromColumns: fkInfo.columns,
                     toTable: fkInfo.referencedTable,
                     toColumns: fkInfo.referencedColumns,
@@ -419,8 +510,8 @@ export class DMAdapter {
         }
         // 组装表信息
         const tableInfos = [];
-        for (const [tableName, columns] of columnsByTable.entries()) {
-            const tableIndexes = indexesByTable.get(tableName);
+        for (const [tableKey, columns] of columnsByTable.entries()) {
+            const tableIndexes = indexesByTable.get(tableKey);
             const indexInfos = [];
             if (tableIndexes) {
                 for (const [indexName, indexData] of tableIndexes.entries()) {
@@ -432,7 +523,7 @@ export class DMAdapter {
                 }
             }
             // 组装外键信息
-            const tableForeignKeys = foreignKeysByTable.get(tableName);
+            const tableForeignKeys = foreignKeysByTable.get(tableKey);
             const foreignKeyInfos = [];
             if (tableForeignKeys) {
                 for (const [constraintName, fkData] of tableForeignKeys.entries()) {
@@ -446,13 +537,14 @@ export class DMAdapter {
                 }
             }
             tableInfos.push({
-                name: String(tableName).toLowerCase(),
-                comment: tableCommentsByTable.get(tableName) || undefined,
+                name: String(tableKey).toLowerCase(),
+                schema: schemaByTable.get(tableKey),
+                comment: tableCommentsByTable.get(tableKey) || undefined,
                 columns,
-                primaryKeys: primaryKeysByTable.get(tableName) || [],
+                primaryKeys: primaryKeysByTable.get(tableKey) || [],
                 indexes: indexInfos,
                 foreignKeys: foreignKeyInfos.length > 0 ? foreignKeyInfos : undefined,
-                estimatedRows: rowsByTable.get(tableName) || 0,
+                estimatedRows: rowsByTable.get(tableKey) || 0,
             });
         }
         // 按表名排序