fdb2 1.0.39 → 1.0.40

package/dist/server/service/database/cockroachdb.service.ts

@@ -24,39 +24,45 @@ export class CockroachDBService extends BaseDatabaseService {
 
   /**
    * 获取CockroachDB数据库列表
+   * 注意：CockroachDB 兼容 PostgreSQL 协议，但没有 information_schema.databases，
+   * 数据库列表须查 pg_database。
    */
   async getDatabases(dataSource: DataSource): Promise<string[]> {
     const result = await dataSource.query(`
-      SELECT 
-        database_name as name
-      FROM 
-        information_schema.databases
-      WHERE 
-        database_name NOT IN ('system', 'pg_catalog', 'information_schema', 'crdb_internal')
-      ORDER BY 
-        database_name
+      SELECT
+        datname as name
+      FROM
+        pg_database
+      WHERE
+        datname NOT IN ('system', 'postgres')
+      ORDER BY
+        datname
     `);
     return result.map((row: any) => row.name);
   }
 
   /**
    * 获取CockroachDB表列表
+   * 注意：CockroachDB 的 information_schema.tables 没有 oid 列（与 PG 不同），
+   * 且 table_schema 是 'public' 而非数据库名。改为直接查 pg_class（relkind='r' 为普通表），
+   * 连接已定位到目标数据库，无需再按库名过滤。
    */
   async getTables(dataSource: DataSource, database: string): Promise<TableEntity[]> {
     const result = await dataSource.query(`
-      SELECT 
-        t.table_name as name,
+      SELECT
+        c.relname as name,
         'table' as type,
-        obj_description(t.oid) as comment
-      FROM 
-        information_schema.tables t
-      WHERE 
-        t.table_schema = $1
-        AND t.table_type = 'BASE TABLE'
-      ORDER BY 
-        t.table_name
-    `, [database]);
-    
+        obj_description(c.oid) as comment
+      FROM
+        pg_class c
+        JOIN pg_namespace n ON n.oid = c.relnamespace
+      WHERE
+        c.relkind = 'r'
+        AND n.nspname NOT IN ('information_schema', 'pg_catalog', 'system')
+      ORDER BY
+        c.relname
+    `);
+
     return result.map((row: any) => ({
       name: row.name,
       type: row.type,
@@ -81,33 +87,31 @@ export class CockroachDBService extends BaseDatabaseService {
           WHEN column_name IN (
             SELECT column_name 
             FROM information_schema.key_column_usage 
-            WHERE table_schema = $1 
-              AND table_name = $2 
+            WHERE table_name = $1 
               AND constraint_name LIKE '%_pkey'
           ) THEN true
           ELSE false
-        END as isPrimary,
+        END as "isPrimary",
         CASE 
-          WHEN data_type LIKE '%serial%' OR data_type LIKE '%identity%' 
+          WHEN column_default LIKE '%nextval%' OR is_identity = 'YES'
           THEN true
           ELSE false
-        END as isAutoIncrement
+        END as "isAutoIncrement"
       FROM 
         information_schema.columns
       WHERE 
-        table_schema = $1
-        AND table_name = $2
+        table_name = $1
       ORDER BY 
         ordinal_position
-    `, [database, table]);
+    `, [table]);
     
     return result.map((row: any) => ({
       name: row.name,
       type: row.type,
       nullable: row.nullable === 'YES',
       defaultValue: row.defaultValue,
-      isPrimary: row.isPrimary,
-      isAutoIncrement: row.isAutoIncrement
+      isPrimary: row.isPrimary === true,
+      isAutoIncrement: row.isAutoIncrement === true
     }));
   }
 
@@ -119,34 +123,43 @@ export class CockroachDBService extends BaseDatabaseService {
       SELECT 
         i.relname as name,
         CASE 
-          WHEN i.indisunique THEN 'UNIQUE'
+          WHEN ix.indisunique THEN 'UNIQUE'
           ELSE 'INDEX'
         END as type,
-        array_agg(a.attname ORDER BY k.n) as columns,
-        i.indisunique as unique
+        array_agg(a.attname ORDER BY array_position(ix.indkey, a.attnum)) as columns,
+        ix.indisunique as unique
       FROM 
-        pg_index i
-        JOIN pg_class t ON t.oid = i.indrelid
-        JOIN pg_namespace n ON n.oid = t.relnamespace
-        JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = ANY(i.indkey)
-        CROSS JOIN LATERAL unnest(i.indkey) WITH ORDINALITY AS k(n, ord) ON true
+        pg_index ix
+        JOIN pg_class t ON t.oid = ix.indrelid
+        JOIN pg_class i ON i.oid = ix.indexrelid
+        JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = ANY(ix.indkey)
       WHERE 
-        n.nspname = $1
-        AND t.relname = $2
+        t.relname = $1
       GROUP BY 
-        i.relname, i.indisunique
+        i.relname, ix.indisunique
       ORDER BY 
         i.relname
-    `, [database, table]);
+    `, [table]);
     
     return result.map((row: any) => ({
       name: row.name,
       type: row.type,
-      columns: row.columns || [],
+      columns: this.parsePgArray(row.columns),
       unique: row.unique
     }));
   }
 
+  /**
+   * 解析 pg 驱动返回的数组字符串（形如 "{a,b}" 或 "{a}"）为 JS 数组
+   */
+  private parsePgArray(value: any): string[] {
+    if (Array.isArray(value)) return value;
+    if (typeof value !== 'string') return [];
+    const s = value.trim();
+    if (!s || s === '{}') return [];
+    return s.replace(/^\{|\}$/g, '').split(',').map((x) => x.trim().replace(/^"|"$/g, ''));
+  }
+
   /**
    * 获取CockroachDB外键信息
    */
@@ -171,11 +184,10 @@ export class CockroachDBService extends BaseDatabaseService {
           ON rc.constraint_name = tc.constraint_name
       WHERE 
         tc.constraint_type = 'FOREIGN KEY'
-        AND tc.table_schema = $1
-        AND tc.table_name = $2
+        AND tc.table_name = $1
       ORDER BY 
         tc.constraint_name
-    `, [database, table]);
+    `, [table]);
     
     return result.map((row: any) => ({
       name: row.name,
@@ -216,11 +228,9 @@ export class CockroachDBService extends BaseDatabaseService {
         view_definition as definition
       FROM 
         information_schema.views
-      WHERE 
-        table_schema = $1
       ORDER BY 
         table_name
-    `, [database]);
+    `);
     
     return result.map((row: any) => ({
       name: row.name,
@@ -240,9 +250,8 @@ export class CockroachDBService extends BaseDatabaseService {
       FROM 
         information_schema.views
       WHERE 
-        table_schema = $1
-        AND table_name = $2
-    `, [database, viewName]);
+        table_name = $1
+    `, [viewName]);
     return result[0]?.definition || '';
   }
 
@@ -259,11 +268,11 @@ export class CockroachDBService extends BaseDatabaseService {
         pg_proc p
         JOIN pg_namespace n ON n.oid = p.pronamespace
       WHERE 
-        n.nspname = $1
+        n.nspname NOT IN ('information_schema', 'pg_catalog', 'system')
         AND p.prokind = 'f'
       ORDER BY 
         p.proname
-    `, [database]);
+    `);
     
     return result.map((row: any) => ({
       name: row.name,
@@ -283,9 +292,9 @@ export class CockroachDBService extends BaseDatabaseService {
         pg_proc p
         JOIN pg_namespace n ON n.oid = p.pronamespace
       WHERE 
-        n.nspname = $1
-        AND p.proname = $2
-    `, [database, procedureName]);
+        n.nspname NOT IN ('information_schema', 'pg_catalog', 'system')
+        AND p.proname = $1
+    `, [procedureName]);
     return result[0]?.definition || '';
   }
 

package/dist/server/service/database/database.service.d.ts

@@ -1,7 +1,7 @@
 import { ConnectionService } from '../connection.service';
 import { BaseDatabaseService } from './base.service';
 import { DatabaseEntity, TableEntity } from '../../model/database.entity';
-import type { DdlCapability, DdlPreview, TableSpec } from '../../model/ddl-spec';
+import type { DdlCapability, DdlExecuteResult, DdlPreview, TableSpec } from '../../model/ddl-spec';
 /**
  * 数据库服务管理类
  * 负责根据数据库类型选择相应的服务实现
@@ -82,9 +82,7 @@ export declare class DatabaseService {
     /**
      * 执行建表：与预览同一出口生成语句后执行（事务包裹）。
      */
-    executeCreateTable(connectionId: string, databaseName: string, spec: TableSpec): Promise<{
-        statements: string[];
-    }>;
+    executeCreateTable(connectionId: string, databaseName: string, spec: TableSpec): Promise<DdlExecuteResult>;
     /**
      * 表结构变更计划（preview/execute 的单一出口）。
      *
@@ -132,223 +130,7 @@ export declare class DatabaseService {
     /**
      * 获取支持的数据库类型
      */
-    getSupportedDatabaseTypes(): ({
-        value: string;
-        label: string;
-        icon: string;
-        defaultPort: number;
-        description: string;
-        features: {
-            supportSchemas: boolean;
-            supportProcedures: boolean;
-            supportTriggers: boolean;
-            supportViews: boolean;
-            supportFullTextSearch: boolean;
-            supportJson: boolean;
-            supportArrays?: undefined;
-            supportEnum?: undefined;
-            supportSequences?: undefined;
-            supportSynonyms?: undefined;
-            supportStoredProcedures?: undefined;
-            supportDistributed?: undefined;
-            supportDocuments?: undefined;
-            supportNoSQL?: undefined;
-            supportInMemory?: undefined;
-            supportHighPerformance?: undefined;
-        };
-    } | {
-        value: string;
-        label: string;
-        icon: string;
-        defaultPort: number;
-        description: string;
-        features: {
-            supportSchemas: boolean;
-            supportProcedures: boolean;
-            supportTriggers: boolean;
-            supportViews: boolean;
-            supportFullTextSearch: boolean;
-            supportJson: boolean;
-            supportArrays: boolean;
-            supportEnum: boolean;
-            supportSequences?: undefined;
-            supportSynonyms?: undefined;
-            supportStoredProcedures?: undefined;
-            supportDistributed?: undefined;
-            supportDocuments?: undefined;
-            supportNoSQL?: undefined;
-            supportInMemory?: undefined;
-            supportHighPerformance?: undefined;
-        };
-    } | {
-        value: string;
-        label: string;
-        icon: string;
-        defaultPort: any;
-        description: string;
-        features: {
-            supportSchemas: boolean;
-            supportProcedures: boolean;
-            supportTriggers: boolean;
-            supportViews: boolean;
-            supportFullTextSearch: boolean;
-            supportJson: boolean;
-            supportArrays: boolean;
-            supportEnum?: undefined;
-            supportSequences?: undefined;
-            supportSynonyms?: undefined;
-            supportStoredProcedures?: undefined;
-            supportDistributed?: undefined;
-            supportDocuments?: undefined;
-            supportNoSQL?: undefined;
-            supportInMemory?: undefined;
-            supportHighPerformance?: undefined;
-        };
-    } | {
-        value: string;
-        label: string;
-        icon: string;
-        defaultPort: number;
-        description: string;
-        features: {
-            supportSchemas: boolean;
-            supportProcedures: boolean;
-            supportTriggers: boolean;
-            supportViews: boolean;
-            supportFullTextSearch: boolean;
-            supportJson: boolean;
-            supportArrays: boolean;
-            supportSequences: boolean;
-            supportSynonyms: boolean;
-            supportEnum?: undefined;
-            supportStoredProcedures?: undefined;
-            supportDistributed?: undefined;
-            supportDocuments?: undefined;
-            supportNoSQL?: undefined;
-            supportInMemory?: undefined;
-            supportHighPerformance?: undefined;
-        };
-    } | {
-        value: string;
-        label: string;
-        icon: string;
-        defaultPort: number;
-        description: string;
-        features: {
-            supportSchemas: boolean;
-            supportProcedures: boolean;
-            supportTriggers: boolean;
-            supportViews: boolean;
-            supportFullTextSearch: boolean;
-            supportJson: boolean;
-            supportArrays: boolean;
-            supportStoredProcedures: boolean;
-            supportEnum?: undefined;
-            supportSequences?: undefined;
-            supportSynonyms?: undefined;
-            supportDistributed?: undefined;
-            supportDocuments?: undefined;
-            supportNoSQL?: undefined;
-            supportInMemory?: undefined;
-            supportHighPerformance?: undefined;
-        };
-    } | {
-        value: string;
-        label: string;
-        icon: string;
-        defaultPort: number;
-        description: string;
-        features: {
-            supportSchemas: boolean;
-            supportProcedures: boolean;
-            supportTriggers: boolean;
-            supportViews: boolean;
-            supportFullTextSearch: boolean;
-            supportJson: boolean;
-            supportArrays: boolean;
-            supportEnum: boolean;
-            supportDistributed: boolean;
-            supportSequences?: undefined;
-            supportSynonyms?: undefined;
-            supportStoredProcedures?: undefined;
-            supportDocuments?: undefined;
-            supportNoSQL?: undefined;
-            supportInMemory?: undefined;
-            supportHighPerformance?: undefined;
-        };
-    } | {
-        value: string;
-        label: string;
-        icon: string;
-        defaultPort: number;
-        description: string;
-        features: {
-            supportSchemas: boolean;
-            supportProcedures: boolean;
-            supportTriggers: boolean;
-            supportViews: boolean;
-            supportFullTextSearch: boolean;
-            supportJson: boolean;
-            supportArrays: boolean;
-            supportDocuments: boolean;
-            supportNoSQL: boolean;
-            supportEnum?: undefined;
-            supportSequences?: undefined;
-            supportSynonyms?: undefined;
-            supportStoredProcedures?: undefined;
-            supportDistributed?: undefined;
-            supportInMemory?: undefined;
-            supportHighPerformance?: undefined;
-        };
-    } | {
-        value: string;
-        label: string;
-        icon: string;
-        defaultPort: number;
-        description: string;
-        features: {
-            supportSchemas: boolean;
-            supportProcedures: boolean;
-            supportTriggers: boolean;
-            supportViews: boolean;
-            supportFullTextSearch: boolean;
-            supportJson: boolean;
-            supportArrays: boolean;
-            supportInMemory: boolean;
-            supportHighPerformance: boolean;
-            supportEnum?: undefined;
-            supportSequences?: undefined;
-            supportSynonyms?: undefined;
-            supportStoredProcedures?: undefined;
-            supportDistributed?: undefined;
-            supportDocuments?: undefined;
-            supportNoSQL?: undefined;
-        };
-    } | {
-        value: string;
-        label: string;
-        icon: string;
-        defaultPort: number;
-        description: string;
-        features: {
-            supportSchemas: boolean;
-            supportProcedures: boolean;
-            supportTriggers: boolean;
-            supportViews: boolean;
-            supportFullTextSearch: boolean;
-            supportJson: boolean;
-            supportArrays: boolean;
-            supportDistributed: boolean;
-            supportHighPerformance: boolean;
-            supportEnum?: undefined;
-            supportSequences?: undefined;
-            supportSynonyms?: undefined;
-            supportStoredProcedures?: undefined;
-            supportDocuments?: undefined;
-            supportNoSQL?: undefined;
-            supportInMemory?: undefined;
-        };
-    })[];
+    getSupportedDatabaseTypes(): any[];
     /**
      * 创建数据库
      */

package/dist/server/service/database/database.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"database.service.d.ts","sourceRoot":"","sources":["../../../../server/service/database/database.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"database.service.d.ts","sourceRoot":"","sources":["../../../../server/service/database/database.service.ts"],"names":[],"mappings":"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"}

package/dist/server/service/database/database.service.js

@@ -165,20 +165,23 @@ class DatabaseService {
     /**
      * 目标态 TableSpec 的静态校验（建表/改表共用）
      */
-    validateTableSpec(spec) {
+    validateTableSpec(spec, requireColumns = true) {
         if (!spec || typeof spec.name !== 'string' || !spec.name.trim()) {
             throw new Error('目标表名不能为空');
         }
-        if (!Array.isArray(spec.columns) || spec.columns.length === 0) {
+        // 无模式方言（MongoDB 建集合）没有列定义，不强制要求至少一列
+        if (requireColumns && (!Array.isArray(spec.columns) || spec.columns.length === 0)) {
             throw new Error('目标结构至少需要一列');
         }
-        const names = new Set(spec.columns.map((c) => c.name));
-        if (names.size !== spec.columns.length) {
-            throw new Error('目标结构存在重名列');
-        }
-        for (const pk of spec.primaryKey || []) {
-            if (!names.has(pk))
-                throw new Error(`主键列 "${pk}" 不在目标结构中`);
+        if (Array.isArray(spec.columns) && spec.columns.length > 0) {
+            const names = new Set(spec.columns.map((c) => c.name));
+            if (names.size !== spec.columns.length) {
+                throw new Error('目标结构存在重名列');
+            }
+            for (const pk of spec.primaryKey || []) {
+                if (!names.has(pk))
+                    throw new Error(`主键列 "${pk}" 不在目标结构中`);
+            }
         }
         return spec.name.trim();
     }
@@ -188,25 +191,31 @@ class DatabaseService {
      * 前端建表全部走同一渲染出口，CREATE TABLE 不再有第二份方言实现。
      */
     async buildCreatePlan(connectionId, databaseName, spec, forceRefresh = false) {
-        const tableName = this.validateTableSpec(spec);
         const dataSource = await this.connectionService.getActiveConnection(connectionId, databaseName);
         const type = dataSource.options.type;
         const kind = (0, dialect_1.getDialectInfo)(type).kind;
         const dbService = this.getDatabaseService(type);
         const caps = (0, ddl_emitter_1.ddlCapabilities)(kind);
+        // 无模式方言（MongoDB）：走驱动原生建集合——不生成 CREATE TABLE SQL，也不需要列定义
+        const driverCreate = caps.createStrategy === 'driver';
+        const tableName = this.validateTableSpec(spec, !driverCreate);
         // 方言不支持建表：作为计划内错误返回（而非抛出）——capabilities 仍要带回前端用于禁用 UI
         if (!caps.createTable) {
-            return { dataSource, kind, caps, dbService, statements: [], error: `该数据库类型（${kind}）不支持通过 SQL 建表` };
+            return { dataSource, kind, caps, dbService, tableName, statements: [], error: `该数据库类型（${kind}）不支持通过 SQL 建表` };
         }
         // 重名检测：目标态与实时结构冲突（等价 409 语义）。
         // 预览走缓存避免每次输入都全量拉表；执行前必须 force 刷新，否则缓存会让重名检测失效。
         const tables = await this.getTableList(connectionId, databaseName, forceRefresh);
         if (tables.some((t) => (0, ddl_emitter_1.tableNameEquals)(kind, String(t?.name ?? ''), tableName))) {
-            return { dataSource, kind, caps, dbService, statements: [], error: `表 "${tableName}" 已存在` };
+            return { dataSource, kind, caps, dbService, tableName, statements: [], error: `表 "${tableName}" 已存在` };
+        }
+        // 驱动路径：无列定义、无 SQL 语句，执行阶段直接调 dbService.createTable
+        if (driverCreate) {
+            return { dataSource, kind, caps, dbService, tableName, statements: [], error: '' };
         }
         const desired = (0, canonical_1.canonicalizeTableSpec)(spec);
         const statements = (0, ddl_emitter_1.emitCreateDdl)(kind, desired, { mssqlDatabase: databaseName });
-        return { dataSource, kind, caps, dbService, statements, error: '' };
+        return { dataSource, kind, caps, dbService, tableName, statements, error: '' };
     }
     /**
      * 预览建表：纯计算不执行。与执行同一出口生成语句，所见即所得。
@@ -216,14 +225,21 @@ class DatabaseService {
      */
     async previewCreateTable(connectionId, databaseName, spec) {
         const plan = await this.buildCreatePlan(connectionId, databaseName, spec);
-        if (plan.error)
-            throw new Error(plan.error);
-        const previewText = plan.statements.length > 0 ? plan.statements.join(';\n') + ';' : '';
+        // 注意：计划级非致命错误（方言不支持建表、表已存在）不能抛——否则 capabilities 不会返回，
+        // 前端无法据此禁用提交按钮。错误以注释形式写入预览，并由前端 submitDisabledHint 展示。
+        const previewText = plan.statements.length > 0
+            ? plan.statements.join(';\n') + ';'
+            : plan.error
+                ? `-- ${plan.error}`
+                : (plan.caps.createStrategy === 'driver'
+                    ? `-- 创建集合 "${plan.tableName}"（无模式集合，不生成建表 SQL）`
+                    : '');
         return {
             statements: plan.statements,
             preview: previewText,
             changeSet: null,
-            capabilities: plan.caps
+            capabilities: plan.caps,
+            error: plan.error || null
         };
     }
     /**
@@ -234,6 +250,19 @@ class DatabaseService {
         const plan = await this.buildCreatePlan(connectionId, databaseName, spec, true);
         if (plan.error)
             throw new Error(plan.error);
+        // 无模式方言（MongoDB）：没有建表 SQL，直接走驱动原生建集合
+        if (plan.caps.createStrategy === 'driver') {
+            try {
+                await plan.dbService.createTable(plan.dataSource, databaseName, { name: plan.tableName });
+            }
+            catch (error) {
+                console.error('执行创建集合失败:', error);
+                throw new Error(`创建集合失败: ${error instanceof Error ? error.message : String(error)}`);
+            }
+            this.invalidateTableList(connectionId, databaseName); // 集合列表已变化
+            // native: 无 SQL 语句但集合已实际创建——前端据此与"无修改"区分
+            return { statements: plan.statements, native: true };
+        }
         if (plan.statements.length === 0)
             throw new Error('未能生成建表语句');
         try {
@@ -315,14 +344,16 @@ class DatabaseService {
      */
     async previewAlterTable(connectionId, databaseName, tableName, spec) {
         const plan = await this.buildAlterPlan(connectionId, databaseName, tableName, spec);
-        if (plan.error)
-            throw new Error(plan.error);
-        const previewText = plan.statements.length > 0 ? plan.statements.join(';\n') + ';' : '';
+        // 与 previewCreateTable 同理：计划级非致命错误不抛，确保 capabilities 返回以驱动 UI 禁用。
+        const previewText = plan.statements.length > 0
+            ? plan.statements.join(';\n') + ';'
+            : (plan.error ? `-- ${plan.error}` : '');
         return {
             statements: plan.statements,
             preview: previewText,
             changeSet: plan.changeSet,
-            capabilities: plan.caps
+            capabilities: plan.caps,
+            error: plan.error || null
         };
     }
     /**
@@ -646,7 +677,10 @@ class DatabaseService {
                     supportJson: true,
                     supportArrays: true,
                     supportDocuments: true,
-                    supportNoSQL: true
+                    supportNoSQL: true,
+                    // 数据层能力：文档型、无 SQL 编辑器（前端据此切文档模式 UI）
+                    dataModel: 'document',
+                    supportSqlEditor: false
                 }
             },
             {
@@ -654,7 +688,11 @@ class DatabaseService {
                 label: 'SAP HANA',
                 icon: 'bi-database',
                 defaultPort: 39013,
-                description: 'SAP HANA内存数据库',
+                description: 'SAP HANA内存数据库（实验性）',
+                // 实验性：依赖未随默认依赖安装的 @sap/hana-client 驱动，且官方无免费 Docker 镜像，
+                // 本仓库尚未做端到端运行验证。驱动缺失时会给出明确的安装提示。
+                experimental: true,
+                driverPackage: '@sap/hana-client',
                 features: {
                     supportSchemas: true,
                     supportProcedures: true,
@@ -700,7 +738,11 @@ class DatabaseService {
                     supportJson: false
                 }
             }
-        ];
+        ].map((t) => ({
+            ...t,
+            // 数据层能力默认值：关系型 + 支持 SQL；文档型（MongoDB）在自身 features 中覆盖
+            features: { dataModel: 'relational', supportSqlEditor: true, ...(t.features || {}) }
+        }));
     }
     /**
      * 创建数据库