fdb2 1.0.36 → 1.0.37

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

@@ -3,11 +3,12 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { execSync } from 'child_process';
 import { BaseDatabaseService } from './base.service';
-import { 
-  TableEntity, 
-  ColumnEntity, 
-  IndexEntity, 
-  ForeignKeyEntity 
+import { buildColumnType, formatDefaultLiteral, escapeSqlString } from './sql-type.helper';
+import {
+  TableEntity,
+  ColumnEntity,
+  IndexEntity,
+  ForeignKeyEntity
 } from '../../model/database.entity';
 
 /**
@@ -749,28 +750,19 @@ export class PostgreSQLService extends BaseDatabaseService {
 
       // 修改表注释
       if (tableDiff.tableCommentChanged) {
-        sqlStatements.push(`COMMENT ON TABLE "${tableName}" IS '${tableDiff.tableComment}';`);
+        sqlStatements.push(`COMMENT ON TABLE "${tableName}" IS '${escapeSqlString(tableDiff.tableComment)}';`);
       }
 
+      // 重命名列：RENAME COLUMN 保留数据与索引，必须先于其它 ALTER 执行
+      (tableDiff.renamedColumns || []).forEach(({ oldColumn, newColumn }: any) => {
+        sqlStatements.push(`ALTER TABLE "${tableName}" RENAME COLUMN "${oldColumn.name}" TO "${newColumn.name}";`);
+      });
+
       // 添加新列
       tableDiff.addedColumns.forEach((column: any) => {
-        // 检查type是否已经包含长度信息（括号）
-        const typeHasLength = /\(\d+\)/.test(column.type);
-
-        let columnSQL = `ALTER TABLE "${tableName}" ADD COLUMN "${column.name}" ${column.type}`;
-
-        // 处理长度和精度（仅当type中没有指定长度时才添加）
-        if (!typeHasLength) {
-          if (column.length) {
-            columnSQL += `(${column.length})`;
-          } else if (column.precision) {
-            if (column.scale) {
-              columnSQL += `(${column.precision},${column.scale})`;
-            } else {
-              columnSQL += `(${column.precision})`;
-            }
-          }
-        }
+        const columnType = buildColumnType('postgres', column.type, column.length, column.precision, column.scale);
+
+        let columnSQL = `ALTER TABLE "${tableName}" ADD COLUMN "${column.name}" ${columnType}`;
 
         // 处理NULL约束
         if (!column.nullable) {
@@ -779,17 +771,12 @@ export class PostgreSQLService extends BaseDatabaseService {
 
         // 处理默认值
         if (column.defaultValue) {
-          const upperDefault = column.defaultValue.toString().toUpperCase();
-          if (['CURRENT_TIMESTAMP', 'NOW()', 'CURRENT_DATE', 'CURRENT_TIME'].includes(upperDefault)) {
-            columnSQL += ` DEFAULT ${upperDefault}`;
-          } else {
-            columnSQL += ` DEFAULT '${column.defaultValue}'`;
-          }
+          columnSQL += ` DEFAULT ${formatDefaultLiteral(column.defaultValue)}`;
         }
 
         // 处理自增（PostgreSQL使用SERIAL或GENERATED AS IDENTITY）
         if (column.isAutoIncrement) {
-          if (column.type.toLowerCase().includes('serial') || column.type.toLowerCase().includes('bigserial')) {
+          if (column.type.toLowerCase().includes('serial')) {
             // 类型已经包含自增
           } else {
             columnSQL += ' GENERATED ALWAYS AS IDENTITY';
@@ -800,33 +787,16 @@ export class PostgreSQLService extends BaseDatabaseService {
 
         // 添加列注释
         if (column.comment) {
-          sqlStatements.push(`COMMENT ON COLUMN "${tableName}"."${column.name}" IS '${column.comment}';`);
+          sqlStatements.push(`COMMENT ON COLUMN "${tableName}"."${column.name}" IS '${escapeSqlString(column.comment)}';`);
         }
       });
 
       // 修改列
       tableDiff.modifiedColumns.forEach((modification: any) => {
         const { oldColumn, newColumn } = modification;
+        const columnType = buildColumnType('postgres', newColumn.type, newColumn.length, newColumn.precision, newColumn.scale);
 
-        // 检查type是否已经包含长度信息（括号）
-        const typeHasLength = /\(\d+\)/.test(newColumn.type);
-
-        let columnSQL = `ALTER TABLE "${tableName}" ALTER COLUMN "${newColumn.name}" SET DATA TYPE ${newColumn.type}`;
-
-        // 处理长度和精度（仅当type中没有指定长度时才添加）
-        if (!typeHasLength) {
-          if (newColumn.length) {
-            columnSQL += `(${newColumn.length})`;
-          } else if (newColumn.precision) {
-            if (newColumn.scale) {
-              columnSQL += `(${newColumn.precision},${newColumn.scale})`;
-            } else {
-              columnSQL += `(${newColumn.precision})`;
-            }
-          }
-        }
-
-        sqlStatements.push(columnSQL + ';');
+        sqlStatements.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${newColumn.name}" SET DATA TYPE ${columnType};`);
 
         // 修改NULL约束
         if (!newColumn.nullable) {
@@ -837,19 +807,14 @@ export class PostgreSQLService extends BaseDatabaseService {
 
         // 修改默认值
         if (newColumn.defaultValue) {
-          const upperDefault = newColumn.defaultValue.toString().toUpperCase();
-          if (['CURRENT_TIMESTAMP', 'NOW()', 'CURRENT_DATE', 'CURRENT_TIME'].includes(upperDefault)) {
-            sqlStatements.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${newColumn.name}" SET DEFAULT ${upperDefault};`);
-          } else {
-            sqlStatements.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${newColumn.name}" SET DEFAULT '${newColumn.defaultValue}';`);
-          }
+          sqlStatements.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${newColumn.name}" SET DEFAULT ${formatDefaultLiteral(newColumn.defaultValue)};`);
         } else {
           sqlStatements.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${newColumn.name}" DROP DEFAULT;`);
         }
 
         // 修改列注释
         if (newColumn.comment) {
-          sqlStatements.push(`COMMENT ON COLUMN "${tableName}"."${newColumn.name}" IS '${newColumn.comment}';`);
+          sqlStatements.push(`COMMENT ON COLUMN "${tableName}"."${newColumn.name}" IS '${escapeSqlString(newColumn.comment)}';`);
         }
       });
 

package/dist/server/service/database/sql-type.helper.d.ts

@@ -0,0 +1,28 @@
+/**
+ * SQL 类型参数工具。
+ *
+ * 解决的问题：前端提交的列类型可能只带基础类型名（如 VARCHAR）而长度/精度为空，
+ * 直接拼接会生成非法 SQL（MySQL 的 `VARCHAR` 必须带长度、`DECIMAL` 必须带精度）。
+ * 这里按数据库补齐默认参数；类型本身已带括号（如 ENUM('a','b')、DECIMAL(10,2)）时原样返回。
+ */
+/** 类型是否已自带参数（如 VARCHAR(255)、DECIMAL(10,2)、ENUM('a','b')） */
+export declare function hasTypeParams(type: string): boolean;
+/** 提取类型的基础名称（去掉括号及参数） */
+export declare function baseTypeName(type: string): string;
+/**
+ * 构建列类型字符串，按数据库补齐缺失的长度/精度参数。
+ *
+ * @param databaseType mysql | postgres | mssql | oracle | sqlite
+ * @param type 列类型（可能已带参数）
+ * @param length 用户填写的长度
+ * @param precision 用户填写的精度
+ * @param scale 用户填写的小数位
+ */
+export declare function buildColumnType(databaseType: string, type: string, length?: number | string | null, precision?: number | string | null, scale?: number | string | null): string;
+/** 转义 SQL 字符串字面量中的单引号 */
+export declare function escapeSqlString(value: any): string;
+/** 默认值是否为函数/关键字形式（不加引号） */
+export declare function isFunctionDefault(value: any): boolean;
+/** 生成 SQL 默认值字面量（函数原样输出，其余加引号并转义） */
+export declare function formatDefaultLiteral(value: any): string;
+//# sourceMappingURL=sql-type.helper.d.ts.map

package/dist/server/service/database/sql-type.helper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sql-type.helper.d.ts","sourceRoot":"","sources":["../../../../server/service/database/sql-type.helper.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAyDH,4DAA4D;AAC5D,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEnD;AAED,yBAAyB;AACzB,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKjD;AASD;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,EAC/B,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,EAClC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAC7B,MAAM,CAkBR;AAED,yBAAyB;AACzB,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,CAElD;AAWD,2BAA2B;AAC3B,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAYrD;AAED,qCAAqC;AACrC,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,CAQvD"}

package/dist/server/service/database/sql-type.helper.js

@@ -0,0 +1,151 @@
+"use strict";
+/**
+ * SQL 类型参数工具。
+ *
+ * 解决的问题：前端提交的列类型可能只带基础类型名（如 VARCHAR）而长度/精度为空，
+ * 直接拼接会生成非法 SQL（MySQL 的 `VARCHAR` 必须带长度、`DECIMAL` 必须带精度）。
+ * 这里按数据库补齐默认参数；类型本身已带括号（如 ENUM('a','b')、DECIMAL(10,2)）时原样返回。
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasTypeParams = hasTypeParams;
+exports.baseTypeName = baseTypeName;
+exports.buildColumnType = buildColumnType;
+exports.escapeSqlString = escapeSqlString;
+exports.isFunctionDefault = isFunctionDefault;
+exports.formatDefaultLiteral = formatDefaultLiteral;
+/**
+ * 各数据库中「缺参即非法」的类型的默认参数。
+ * SQLite 的 VARCHAR 等不带长度也合法，因此不在此列。
+ */
+const TYPE_DEFAULTS = {
+    mysql: {
+        tinyint: { length: 4 },
+        smallint: { length: 6 },
+        mediumint: { length: 9 },
+        int: { length: 11 },
+        integer: { length: 11 },
+        bigint: { length: 20 },
+        decimal: { precision: 10, scale: 2 },
+        float: { precision: 10, scale: 2 },
+        double: { precision: 16, scale: 4 },
+        bit: { length: 1 },
+        char: { length: 1 },
+        varchar: { length: 255 },
+        binary: { length: 1 },
+        varbinary: { length: 255 }
+    },
+    postgres: {
+        decimal: { precision: 10, scale: 2 },
+        numeric: { precision: 10, scale: 2 },
+        'character varying': { length: 255 },
+        varchar: { length: 255 },
+        character: { length: 1 },
+        char: { length: 1 }
+    },
+    mssql: {
+        decimal: { precision: 18, scale: 0 },
+        numeric: { precision: 18, scale: 0 },
+        float: { precision: 53 },
+        char: { length: 1 },
+        varchar: { length: 255 },
+        nchar: { length: 1 },
+        nvarchar: { length: 255 },
+        binary: { length: 1 },
+        varbinary: { length: 255 }
+    },
+    oracle: {
+        char: { length: 1 },
+        nchar: { length: 1 },
+        varchar2: { length: 4000 },
+        nvarchar2: { length: 2000 },
+        raw: { length: 2000 }
+    }
+};
+/** 类型是否已自带参数（如 VARCHAR(255)、DECIMAL(10,2)、ENUM('a','b')） */
+function hasTypeParams(type) {
+    return !!type && type.includes('(');
+}
+/** 提取类型的基础名称（去掉括号及参数） */
+function baseTypeName(type) {
+    if (!type)
+        return '';
+    const match = type.trim().match(/^([a-zA-Z\s]+?)\s*\(/);
+    const base = match?.[1] ?? type;
+    return base.trim().toLowerCase();
+}
+/** 把用户输入的长度/精度/小数位规整为数字，空值视为未填写 */
+function toNumber(value) {
+    if (value === null || value === undefined || value === '')
+        return null;
+    const num = Number(value);
+    return Number.isNaN(num) ? null : num;
+}
+/**
+ * 构建列类型字符串，按数据库补齐缺失的长度/精度参数。
+ *
+ * @param databaseType mysql | postgres | mssql | oracle | sqlite
+ * @param type 列类型（可能已带参数）
+ * @param length 用户填写的长度
+ * @param precision 用户填写的精度
+ * @param scale 用户填写的小数位
+ */
+function buildColumnType(databaseType, type, length, precision, scale) {
+    if (!type || hasTypeParams(type))
+        return type;
+    const defaults = TYPE_DEFAULTS[String(databaseType || '').toLowerCase()]?.[baseTypeName(type)];
+    if (!defaults)
+        return type;
+    if (defaults.precision != null) {
+        const p = toNumber(precision) ?? defaults.precision;
+        const s = toNumber(scale) ?? defaults.scale;
+        return s != null ? `${type}(${p},${s})` : `${type}(${p})`;
+    }
+    if (defaults.length != null) {
+        const l = toNumber(length) ?? defaults.length;
+        return l != null ? `${type}(${l})` : type;
+    }
+    return type;
+}
+/** 转义 SQL 字符串字面量中的单引号 */
+function escapeSqlString(value) {
+    return String(value ?? '').replace(/'/g, "''");
+}
+/** 各数据库常见的函数/关键字形式默认值（应原样输出，不加引号） */
+const DEFAULT_KEYWORDS = new Set([
+    'current_timestamp', 'now()', 'current_date', 'current_time',
+    'localtimestamp', 'localtime', 'current_user',
+    'sysdate', 'systimestamp', 'getdate()', 'getutcdate()',
+    'sysdatetime()', 'sysdatetimeoffset()', 'sysutcdatetime()',
+    'newid()', 'newsequentialid()', 'gen_random_uuid()', 'uuid_generate_v4()'
+]);
+/** 默认值是否为函数/关键字形式（不加引号） */
+function isFunctionDefault(value) {
+    if (value === null || value === undefined)
+        return false;
+    const raw = String(value).trim();
+    if (!raw)
+        return false;
+    const lower = raw.toLowerCase();
+    if (lower === 'null')
+        return true;
+    if (DEFAULT_KEYWORDS.has(lower))
+        return true;
+    // now() / getdate() / newid() 等零参函数调用
+    if (/^[a-z_][a-z0-9_]*\s*\(\s*\)$/.test(lower))
+        return true;
+    // current_timestamp(6) 等带精度参数的时间函数
+    if (/^current_timestamp\s*\(\s*\d+\s*\)$/.test(lower))
+        return true;
+    return false;
+}
+/** 生成 SQL 默认值字面量（函数原样输出，其余加引号并转义） */
+function formatDefaultLiteral(value) {
+    if (value === null || value === undefined || String(value).trim() === '') {
+        return 'NULL';
+    }
+    if (isFunctionDefault(value)) {
+        return String(value).trim();
+    }
+    return `'${escapeSqlString(value)}'`;
+}
+//# sourceMappingURL=sql-type.helper.js.map

package/dist/server/service/database/sql-type.helper.js.map

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

package/dist/server/service/database/sql-type.helper.ts

@@ -0,0 +1,157 @@
+/**
+ * SQL 类型参数工具。
+ *
+ * 解决的问题：前端提交的列类型可能只带基础类型名（如 VARCHAR）而长度/精度为空，
+ * 直接拼接会生成非法 SQL（MySQL 的 `VARCHAR` 必须带长度、`DECIMAL` 必须带精度）。
+ * 这里按数据库补齐默认参数；类型本身已带括号（如 ENUM('a','b')、DECIMAL(10,2)）时原样返回。
+ */
+
+interface TypeDefault {
+  length?: number;
+  precision?: number;
+  scale?: number;
+}
+
+/**
+ * 各数据库中「缺参即非法」的类型的默认参数。
+ * SQLite 的 VARCHAR 等不带长度也合法，因此不在此列。
+ */
+const TYPE_DEFAULTS: Record<string, Record<string, TypeDefault>> = {
+  mysql: {
+    tinyint: { length: 4 },
+    smallint: { length: 6 },
+    mediumint: { length: 9 },
+    int: { length: 11 },
+    integer: { length: 11 },
+    bigint: { length: 20 },
+    decimal: { precision: 10, scale: 2 },
+    float: { precision: 10, scale: 2 },
+    double: { precision: 16, scale: 4 },
+    bit: { length: 1 },
+    char: { length: 1 },
+    varchar: { length: 255 },
+    binary: { length: 1 },
+    varbinary: { length: 255 }
+  },
+  postgres: {
+    decimal: { precision: 10, scale: 2 },
+    numeric: { precision: 10, scale: 2 },
+    'character varying': { length: 255 },
+    varchar: { length: 255 },
+    character: { length: 1 },
+    char: { length: 1 }
+  },
+  mssql: {
+    decimal: { precision: 18, scale: 0 },
+    numeric: { precision: 18, scale: 0 },
+    float: { precision: 53 },
+    char: { length: 1 },
+    varchar: { length: 255 },
+    nchar: { length: 1 },
+    nvarchar: { length: 255 },
+    binary: { length: 1 },
+    varbinary: { length: 255 }
+  },
+  oracle: {
+    char: { length: 1 },
+    nchar: { length: 1 },
+    varchar2: { length: 4000 },
+    nvarchar2: { length: 2000 },
+    raw: { length: 2000 }
+  }
+};
+
+/** 类型是否已自带参数（如 VARCHAR(255)、DECIMAL(10,2)、ENUM('a','b')） */
+export function hasTypeParams(type: string): boolean {
+  return !!type && type.includes('(');
+}
+
+/** 提取类型的基础名称（去掉括号及参数） */
+export function baseTypeName(type: string): string {
+  if (!type) return '';
+  const match = type.trim().match(/^([a-zA-Z\s]+?)\s*\(/);
+  const base = match?.[1] ?? type;
+  return base.trim().toLowerCase();
+}
+
+/** 把用户输入的长度/精度/小数位规整为数字，空值视为未填写 */
+function toNumber(value: number | string | null | undefined): number | null {
+  if (value === null || value === undefined || value === '') return null;
+  const num = Number(value);
+  return Number.isNaN(num) ? null : num;
+}
+
+/**
+ * 构建列类型字符串，按数据库补齐缺失的长度/精度参数。
+ *
+ * @param databaseType mysql | postgres | mssql | oracle | sqlite
+ * @param type 列类型（可能已带参数）
+ * @param length 用户填写的长度
+ * @param precision 用户填写的精度
+ * @param scale 用户填写的小数位
+ */
+export function buildColumnType(
+  databaseType: string,
+  type: string,
+  length?: number | string | null,
+  precision?: number | string | null,
+  scale?: number | string | null
+): string {
+  if (!type || hasTypeParams(type)) return type;
+
+  const defaults = TYPE_DEFAULTS[String(databaseType || '').toLowerCase()]?.[baseTypeName(type)];
+  if (!defaults) return type;
+
+  if (defaults.precision != null) {
+    const p = toNumber(precision) ?? defaults.precision;
+    const s = toNumber(scale) ?? defaults.scale;
+    return s != null ? `${type}(${p},${s})` : `${type}(${p})`;
+  }
+
+  if (defaults.length != null) {
+    const l = toNumber(length) ?? defaults.length;
+    return l != null ? `${type}(${l})` : type;
+  }
+
+  return type;
+}
+
+/** 转义 SQL 字符串字面量中的单引号 */
+export function escapeSqlString(value: any): string {
+  return String(value ?? '').replace(/'/g, "''");
+}
+
+/** 各数据库常见的函数/关键字形式默认值（应原样输出，不加引号） */
+const DEFAULT_KEYWORDS = new Set([
+  'current_timestamp', 'now()', 'current_date', 'current_time',
+  'localtimestamp', 'localtime', 'current_user',
+  'sysdate', 'systimestamp', 'getdate()', 'getutcdate()',
+  'sysdatetime()', 'sysdatetimeoffset()', 'sysutcdatetime()',
+  'newid()', 'newsequentialid()', 'gen_random_uuid()', 'uuid_generate_v4()'
+]);
+
+/** 默认值是否为函数/关键字形式（不加引号） */
+export function isFunctionDefault(value: any): boolean {
+  if (value === null || value === undefined) return false;
+  const raw = String(value).trim();
+  if (!raw) return false;
+  const lower = raw.toLowerCase();
+  if (lower === 'null') return true;
+  if (DEFAULT_KEYWORDS.has(lower)) return true;
+  // now() / getdate() / newid() 等零参函数调用
+  if (/^[a-z_][a-z0-9_]*\s*\(\s*\)$/.test(lower)) return true;
+  // current_timestamp(6) 等带精度参数的时间函数
+  if (/^current_timestamp\s*\(\s*\d+\s*\)$/.test(lower)) return true;
+  return false;
+}
+
+/** 生成 SQL 默认值字面量（函数原样输出，其余加引号并转义） */
+export function formatDefaultLiteral(value: any): string {
+  if (value === null || value === undefined || String(value).trim() === '') {
+    return 'NULL';
+  }
+  if (isFunctionDefault(value)) {
+    return String(value).trim();
+  }
+  return `'${escapeSqlString(value)}'`;
+}

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

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