midway-fatcms 0.0.6 → 0.0.8

package/src/libs/crud-sharding/ShardingTableCreator.ts

@@ -1,7 +1,6 @@
-import { CrudPro } from '@/libs/crud-pro/CrudPro';
-import { ITableColumn } from '@/libs/crud-pro/interfaces';
+import { ExecuteSQLRowsResult, ITableColumn } from '@/libs/crud-pro/interfaces';
 import { SqlDbType } from '@/libs/crud-pro/models/keys';
-import { IShardingConfig, IShardingTableCreateOptions, IShardingTableCreateResult } from './ShardingConfig';
+import { CrudProFactory, IShardingConfig, IShardingTableCreateOptions, IShardingTableCreateResult } from './ShardingConfig';
 
 /**
  * 扩展列信息（在 ITableColumn 基础上增加分表建表所需的内部标记）
@@ -25,7 +24,7 @@ interface IShardingTableColumn extends ITableColumn {
  */
 export class ShardingTableCreator {
   constructor(
-    private readonly crudPro: CrudPro,
+    private readonly crudProFactory: CrudProFactory,
     private readonly config: IShardingConfig
   ) {
     this.validateIdentifier(this.config.baseTable, 'baseTable');
@@ -68,36 +67,65 @@ export class ShardingTableCreator {
 
     const { copyIndexes = false } = options;
 
-    try {
-      // 1. 获取基表元信息
-      const tableMeta = await this.getBaseTableMeta(baseCfg);
-      if (!tableMeta || !tableMeta.columnDetails || tableMeta.columnDetails.length === 0) {
-        throw new Error(`[ShardingTableCreator] 无法获取基表 ${this.config.baseTable} 的结构信息`);
-      }
+    // 0. 先检查表是否已存在
+    const tableExists = await this.checkTableExists(tableName, baseCfg);
+    if (tableExists) {
+      // 表已存在，跳过创建和索引复制
+      return { success: true, tableName, createSql: '' };
+    }
 
-      // 2. 生成建表 SQL
-      const createSql = this.generateCreateTableSql(
-        tableName,
-        tableMeta.columnDetails,
-        baseCfg.sqlDbType,
-        options
-      );
+    // 1. 获取基表元信息
+    const tableMeta = await this.getBaseTableMeta(baseCfg);
+    if (!tableMeta || !tableMeta.columnDetails || tableMeta.columnDetails.length === 0) {
+      throw new Error(`[ShardingTableCreator] 无法获取基表 ${this.config.baseTable} 的结构信息`);
+    }
 
-      // 3. 执行建表
-      await this.executeCreateSql(baseCfg, createSql);
+    // 2. 生成建表 SQL
+    const createSql = this.generateCreateTableSql(
+      tableName,
+      tableMeta.columnDetails,
+      baseCfg.sqlDbType,
+      options
+    );
 
-      // 4. 可选：复制索引
-      if (copyIndexes) {
+    // 3. 执行建表
+    await this.executeCreateSql(baseCfg, createSql);
+
+    // 4. 可选：复制索引（只在新建表时执行）
+    if (copyIndexes) {
+      try {
         await this.copyIndexes(tableName, baseCfg);
+      } catch (e) {
+        console.error("copyIndexes", e);
       }
+    }
 
-      return { success: true, tableName, createSql };
+    return { success: true, tableName, createSql };
+
+  }
+
+  /**
+   * 检查表是否已存在
+   * 复用 CrudPro.getAllTableInfos 接口，使用缓存提升性能
+   * DDL 操作本身具有幂等性（CREATE TABLE IF NOT EXISTS），缓存短暂延迟可接受
+   */
+  private async checkTableExists(
+    tableName: string,
+    baseCfg: { sqlDatabase: string; sqlDbType: SqlDbType }
+  ): Promise<boolean> {
+    try {
+      const { tables } = await this.crudProFactory().getAllTableInfos(
+        {
+          sqlDatabase: baseCfg.sqlDatabase,
+          sqlDbType: baseCfg.sqlDbType,
+        },
+        { skipCache: false } // 使用缓存，避免每次建表都直查数据库
+      );
+      return tables.some(t => t.name === tableName);
     } catch (error) {
-      return {
-        success: false,
-        tableName,
-        error: error instanceof Error ? error : new Error(String(error)),
-      };
+      console.warn('[ShardingTableCreator] 检查表存在性失败:', error);
+      // 检查失败时，假设表不存在，继续尝试创建
+      return false;
     }
   }
 
@@ -145,22 +173,21 @@ export class ShardingTableCreator {
     baseCfg: { sqlDatabase: string; sqlDbType: SqlDbType }
   ): Promise<ITableColumn[]> {
     const sql = `
-      SELECT 
-        COLUMN_NAME, COLUMN_TYPE, IS_NULLABLE, COLUMN_KEY, 
+      SELECT
+        COLUMN_NAME, COLUMN_TYPE, IS_NULLABLE, COLUMN_KEY,
         COLUMN_DEFAULT, COLUMN_COMMENT, EXTRA
       FROM information_schema.COLUMNS
       WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = '${this.config.baseTable}'
       ORDER BY ORDINAL_POSITION
     `.trim();
 
-    const result = await this.crudPro.executeSQL({
+    const rows = await this.crudProFactory().executeSQL({
       isNativeSQL: true,
       sqlDatabase: baseCfg.sqlDatabase,
       sqlDbType: baseCfg.sqlDbType,
       executeSql: sql,
-    });
+    }) as ExecuteSQLRowsResult || [];
 
-    const rows = result?.rows || [];
     return rows.map((row: any) => ({
       name: row.COLUMN_NAME,
       type: row.COLUMN_TYPE,
@@ -191,14 +218,12 @@ export class ShardingTableCreator {
       ORDER BY ordinal_position
     `.trim();
 
-    const result = await this.crudPro.executeSQL({
+    const rows = await this.crudProFactory().executeSQL({
       isNativeSQL: true,
       sqlDatabase: baseCfg.sqlDatabase,
       sqlDbType: baseCfg.sqlDbType,
       executeSql: sql,
-    });
-
-    const rows = result?.rows || [];
+    }) as ExecuteSQLRowsResult || [];
 
     // 获取主键列
     const pkColumns = await this.getPostgreSQLPrimaryKeys(baseCfg, schema);
@@ -235,14 +260,14 @@ export class ShardingTableCreator {
         AND i.indisprimary
     `.trim();
 
-    const result = await this.crudPro.executeSQL({
+    const result = await this.crudProFactory().executeSQL({
       isNativeSQL: true,
       sqlDatabase: baseCfg.sqlDatabase,
       sqlDbType: baseCfg.sqlDbType,
       executeSql: sql,
-    });
+    }) as ExecuteSQLRowsResult || [];
 
-    return (result?.rows || []).map((row: any) => row.attname);
+    return result.map((row: any) => row.attname);
   }
 
   /**
@@ -266,14 +291,12 @@ export class ShardingTableCreator {
       ORDER BY c.column_id
     `.trim();
 
-    const result = await this.crudPro.executeSQL({
+    const rows = await this.crudProFactory().executeSQL({
       isNativeSQL: true,
       sqlDatabase: baseCfg.sqlDatabase,
       sqlDbType: baseCfg.sqlDbType,
       executeSql: sql,
-    });
-
-    const rows = result?.rows || [];
+    }) as ExecuteSQLRowsResult || [];
 
     // 获取主键列
     const pkColumns = await this.getSQLServerPrimaryKeys(baseCfg);
@@ -310,14 +333,14 @@ export class ShardingTableCreator {
         AND i.is_primary_key = 1
     `.trim();
 
-    const result = await this.crudPro.executeSQL({
+    const result = await this.crudProFactory().executeSQL({
       isNativeSQL: true,
       sqlDatabase: baseCfg.sqlDatabase,
       sqlDbType: baseCfg.sqlDbType,
       executeSql: sql,
-    });
+    }) as ExecuteSQLRowsResult || [];
 
-    return (result?.rows || []).map((row: any) => row.name);
+    return result.map((row: any) => row.name);
   }
 
   /**
@@ -509,7 +532,7 @@ export class ShardingTableCreator {
     const tableOptions = options.tableOptions ? ` ${options.tableOptions}` : '';
 
     return `IF NOT EXISTS (SELECT * FROM sys.tables WHERE name = '${tableName}')\n` +
-           `CREATE TABLE [${tableName}] (\n  ${columnDefs.join(',\n  ')}\n)${tableOptions}`;
+      `CREATE TABLE [${tableName}] (\n  ${columnDefs.join(',\n  ')}\n)${tableOptions}`;
   }
 
   private formatSQLServerColumn(col: ITableColumn): string {
@@ -702,7 +725,8 @@ export class ShardingTableCreator {
    */
   private async executeCreateSql(
     baseCfg: { sqlDatabase: string; sqlDbType: SqlDbType },
-    createSql: string
+    createSql: string,
+    options: { silentDuplicate?: boolean } = {}
   ): Promise<void> {
     const sqlCfgModel = {
       isNativeSQL: true,
@@ -711,7 +735,36 @@ export class ShardingTableCreator {
       executeSql: createSql,
     };
 
-    await this.crudPro.executeSQL(sqlCfgModel);
+    try {
+      await this.crudProFactory().executeSQL(sqlCfgModel);
+    } catch (error: any) {
+      // 静默处理 DDL "已存在"类错误（表已存在、索引已存在等）
+      if (options.silentDuplicate && this.isDuplicateError(error)) {
+        return;
+      }
+      throw error;
+    }
+  }
+
+  /**
+   * 判断是否为"已存在"类错误（表已存在、索引已存在等）
+   */
+  private isDuplicateError(error: any): boolean {
+    if (!error) return false;
+    const code = error.code || error.errno;
+    const message = error.message || '';
+    // MySQL: ER_TABLE_EXISTS_ERROR (1050), ER_DUP_KEYNAME (1061)
+    // PostgreSQL: 42P07 (duplicate_table), 42P06 (duplicate_schema)
+    // SQL Server: 错误消息包含 "already exists"
+    return code === 'ER_TABLE_EXISTS_ERROR' ||
+           code === 'ER_DUP_KEYNAME' ||
+           code === 1050 ||
+           code === 1061 ||
+           code === '42P07' ||
+           code === '42P06' ||
+           message.includes('already exists') ||
+           message.includes('Duplicate') ||
+           message.includes('Table') && message.includes('already exists');
   }
 
   /**
@@ -724,29 +777,125 @@ export class ShardingTableCreator {
     tableName: string,
     baseCfg: { sqlDatabase: string; sqlDbType: SqlDbType }
   ): Promise<void> {
-    try {
-      const indexDefs = await this.getIndexDefinitions(baseCfg);
+    const indexDefs = await this.getIndexDefinitions(baseCfg);
+
+    // 过滤掉主键索引和空定义
+    const validIndexDefs = indexDefs.filter(def => !def.isPrimary && def.createSql);
+    if (validIndexDefs.length === 0) {
+      return;
+    }
 
-      for (const indexDef of indexDefs) {
-        // 跳过主键索引（已创建）
-        if (indexDef.isPrimary || !indexDef.createSql) continue;
+    // 一次性获取目标表已存在的所有索引名
+    const existingIndexNames = await this.getExistingIndexNames(tableName, baseCfg);
 
-        // 替换表名（支持不同数据库的标识符语法）
+    // 用于去重的 Set，防止同一请求中重复创建同名索引
+    const createdIndexNames = new Set<string>();
+
+    for (const indexDef of validIndexDefs) {
+      try {
+        // 替换表名
         const indexSql = this.replaceTableNameInIndexSql(
           indexDef.createSql,
           tableName,
           baseCfg.sqlDbType
         );
 
-        // 重命名索引以避免冲突
+        // 重命名索引
         const renamedSql = this.renameIndex(indexSql, tableName, baseCfg.sqlDbType);
 
-        await this.executeCreateSql(baseCfg, renamedSql);
+        // 提取新索引名
+        const newIndexName = this.extractIndexName(renamedSql, baseCfg.sqlDbType);
+
+        // 如果索引已存在（数据库中或本次请求已创建），跳过创建
+        if (existingIndexNames.has(newIndexName) || createdIndexNames.has(newIndexName)) {
+          continue;
+        }
+
+        console.info('[ShardingTableCreator] 准备创建索引 =>' + newIndexName  + "  ===> renamedSql" + renamedSql);
+
+        // 使用 silentDuplicate 静默处理"索引已存在"错误
+        await this.executeCreateSql(baseCfg, renamedSql, { silentDuplicate: true });
+        // 创建成功后添加到已创建列表，防止重复创建
+        createdIndexNames.add(newIndexName);
+      } catch (error: any) {
+        // 非预期错误，记录日志
+        console.warn('[ShardingTableCreator] 创建索引失败:', error?.message || error);
+      }
+    }
+  }
+
+  /**
+   * 获取目标表已存在的所有索引名
+   */
+  private async getExistingIndexNames(
+    tableName: string,
+    baseCfg: { sqlDatabase: string; sqlDbType: SqlDbType }
+  ): Promise<Set<string>> {
+    const indexNames = new Set<string>();
+
+    try {
+      if (baseCfg.sqlDbType === SqlDbType.mysql) {
+        const sql = `
+          SELECT INDEX_NAME
+          FROM information_schema.STATISTICS
+          WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = '${tableName}'
+        `;
+        const result = await this.crudProFactory().executeSQL({
+          isNativeSQL: true,
+          sqlDatabase: baseCfg.sqlDatabase,
+          sqlDbType: baseCfg.sqlDbType,
+          executeSql: sql,
+        }) as Array<{ INDEX_NAME: string }>;
+        result.forEach(row => indexNames.add(row.INDEX_NAME));
+      } else if (baseCfg.sqlDbType === SqlDbType.postgres) {
+        const sql = `
+          SELECT indexname
+          FROM pg_indexes
+          WHERE schemaname = 'public' AND tablename = '${tableName}'
+        `;
+        const result = await this.crudProFactory().executeSQL({
+          isNativeSQL: true,
+          sqlDatabase: baseCfg.sqlDatabase,
+          sqlDbType: baseCfg.sqlDbType,
+          executeSql: sql,
+        }) as Array<{ indexname: string }>;
+        result.forEach(row => indexNames.add(row.indexname));
+      } else if (baseCfg.sqlDbType === SqlDbType.sqlserver) {
+        const sql = `
+          SELECT name
+          FROM sys.indexes
+          WHERE object_id = OBJECT_ID('${tableName}')
+        `;
+        const result = await this.crudProFactory().executeSQL({
+          isNativeSQL: true,
+          sqlDatabase: baseCfg.sqlDatabase,
+          sqlDbType: baseCfg.sqlDbType,
+          executeSql: sql,
+        }) as Array<{ name: string }>;
+        result.forEach(row => indexNames.add(row.name));
       }
     } catch (error) {
-      console.warn('[ShardingTableCreator] 复制索引失败:', error);
-      // 索引复制失败不影响主流程
+      console.warn('[ShardingTableCreator] 获取已存在索引列表失败:', error);
+    }
+
+    return indexNames;
+  }
+
+  /**
+   * 从 CREATE INDEX 语句中提取索引名
+   */
+  private extractIndexName(indexSql: string, sqlDbType: SqlDbType): string {
+    if (sqlDbType === SqlDbType.mysql) {
+      const match = indexSql.match(/INDEX `([^`]+)`/i);
+      return match ? match[1] : '';
+    } else if (sqlDbType === SqlDbType.postgres) {
+      const match = indexSql.match(/INDEX "([^"]+)"/i);
+      return match ? match[1] : '';
+    } else if (sqlDbType === SqlDbType.sqlserver) {
+      const match = indexSql.match(/INDEX \[([^\]]+)\]/i);
+      return match ? match[1] : '';
     }
+    return '';
   }
 
   /**
@@ -828,14 +977,12 @@ export class ShardingTableCreator {
       ORDER BY INDEX_NAME, SEQ_IN_INDEX
     `;
 
-    const result = await this.crudPro.executeSQL({
+    const rows = await this.crudProFactory().executeSQL({
       isNativeSQL: true,
       sqlDatabase: baseCfg.sqlDatabase,
       sqlDbType: baseCfg.sqlDbType,
       executeSql: sql,
-    });
-
-    const rows = result?.rows || [];
+    }) as ExecuteSQLRowsResult || [];
 
     // 按索引名分组
     const indexMap = new Map<string, { columns: string[]; isUnique: boolean; isPrimary: boolean }>();
@@ -898,14 +1045,12 @@ export class ShardingTableCreator {
         AND t.relname = '${this.config.baseTable}'
     `;
 
-    const result = await this.crudPro.executeSQL({
+    const rows = await this.crudProFactory().executeSQL({
       isNativeSQL: true,
       sqlDatabase: baseCfg.sqlDatabase,
       sqlDbType: baseCfg.sqlDbType,
       executeSql: sql,
-    });
-
-    const rows = result?.rows || [];
+    }) as ExecuteSQLRowsResult || [];
 
     return rows.map((row: any) => ({
       isPrimary: row.is_primary,
@@ -938,14 +1083,12 @@ export class ShardingTableCreator {
         AND i.name IS NOT NULL
     `;
 
-    const result = await this.crudPro.executeSQL({
+    const rows = await this.crudProFactory().executeSQL({
       isNativeSQL: true,
       sqlDatabase: baseCfg.sqlDatabase,
       sqlDbType: baseCfg.sqlDbType,
       executeSql: sql,
-    });
-
-    const rows = result?.rows || [];
+    }) as ExecuteSQLRowsResult || [];
 
     return rows.map((row: any) => {
       const isPrimary = row.is_primary;

package/src/libs/crud-sharding/ShardingUtils.ts

@@ -82,3 +82,140 @@ export function isCurrentTable(
   const expectedTableName = `${baseTable}_${currentSuffix}`;
   return tableName === expectedTableName;
 }
+
+// ============ 时间字段清理与转换工具函数 ============
+
+/**
+ * 日期字符串的粒度类型
+ */
+export type DateStringGranularity = 'year' | 'month' | 'day' | 'datetime' | null;
+
+/**
+ * 判断日期字符串的粒度
+ *
+ * 根据字符串格式推断精度：
+ * - 4位纯年：'2024' → 'year'
+ * - 7位年-月：'2024-01' → 'month'
+ * - 10位年-月-日：'2024-01-15' → 'day'
+ * - 带时分秒：'2024-01-15 10:30:00' → 'datetime'（精度已足够，不需要转换）
+ *
+ * @param value 待判断的值
+ * @returns 粒度类型，非日期字符串返回 null
+ */
+export function detectDateStringGranularity(value: string): DateStringGranularity {
+  const trimmed = value.trim();
+
+  // 4位纯年：'2024'
+  if (/^\d{4}$/.test(trimmed)) {
+    return 'year';
+  }
+
+  // 7位年-月：'2024-01'
+  if (/^\d{4}-\d{2}$/.test(trimmed)) {
+    return 'month';
+  }
+
+  // 10位年-月-日：'2024-01-15'
+  if (/^\d{4}-\d{2}-\d{2}$/.test(trimmed)) {
+    return 'day';
+  }
+
+  // 带时分秒的完整时间字符串（精度已足够，不需要转换）
+  if (/^\d{4}-\d{2}-\d{2}[T ]\d{1,2}/.test(trimmed)) {
+    return 'datetime';
+  }
+
+  return null;
+}
+
+/**
+ * 判断值是否为时间操作符表达式（ICompareCondition / ILogicalCondition）
+ *
+ * 排除 Date 对象后，typeof === 'object' 且非 null 即为操作符表达式。
+ * 判断优先级：`value instanceof Date` → 先于 `typeof === 'object'` 判断。
+ *
+ * @param value 待判断的值
+ * @returns 是否为操作符表达式
+ */
+export function isOperatorExpression(value: unknown): boolean {
+  // Date 对象是精确值，不是操作符
+  if (value instanceof Date) {
+    return false;
+  }
+  // 非-null 对象视为操作符表达式（如 { $gte: ... }, { $or: ... }）
+  return typeof value === 'object' && value !== null && Object.keys(value).length > 0;
+}
+
+/**
+ * 获取指定年月的最后一天日期
+ *
+ * @param year 年份
+ * @param month 月份（1-12）
+ * @returns 最后一天的日号（28/29/30/31）
+ */
+function getLastDayOfMonth(year: number, month: number): number {
+  // new Date(year, month, 0) 返回上个月最后一天
+  return new Date(year, month, 0).getDate();
+}
+
+/**
+ * 将日期字符串按粒度转换为 $gte/$lte 范围表达式
+ *
+ * 仅对 year/month/day 粒度的字符串进行转换，
+ * datetime 粒度和非日期字符串不转换返回 null。
+ * 闰年2月自动处理（28/29天）。
+ *
+ * @param value 日期字符串
+ * @returns 范围表达式对象，不需要转换时返回 null
+ *
+ * @example
+ * expandDateToRange('2024')
+ * // → { $gte: '2024-01-01 00:00:00', $lte: '2024-12-31 23:59:59' }
+ *
+ * expandDateToRange('2024-01')
+ * // → { $gte: '2024-01-01 00:00:00', $lte: '2024-01-31 23:59:59' }
+ *
+ * expandDateToRange('2024-01-15')
+ * // → { $gte: '2024-01-15 00:00:00', $lte: '2024-01-15 23:59:59' }
+ */
+export function expandDateToRange(value: string): Record<string, string> | null {
+  const granularity = detectDateStringGranularity(value);
+
+  if (!granularity || granularity === 'datetime') {
+    return null;
+  }
+
+  const trimmed = value.trim();
+
+  switch (granularity) {
+    case 'year': {
+      // '2024' → 2024-01-01 ~ 2024-12-31
+      const year = parseInt(trimmed, 10);
+      return {
+        $gte: `${year}-01-01 00:00:00`,
+        $lte: `${year}-12-31 23:59:59`,
+      };
+    }
+    case 'month': {
+      // '2024-01' → 2024-01-01 ~ 2024-01-31
+      const [yearStr, monthStr] = trimmed.split('-');
+      const year = parseInt(yearStr, 10);
+      const month = parseInt(monthStr, 10);
+      const lastDay = getLastDayOfMonth(year, month);
+      const monthPadded = monthStr.padStart(2, '0');
+      return {
+        $gte: `${year}-${monthPadded}-01 00:00:00`,
+        $lte: `${year}-${monthPadded}-${String(lastDay).padStart(2, '0')} 23:59:59`,
+      };
+    }
+    case 'day': {
+      // '2024-01-15' → 2024-01-15 00:00:00 ~ 2024-01-15 23:59:59
+      return {
+        $gte: `${trimmed} 00:00:00`,
+        $lte: `${trimmed} 23:59:59`,
+      };
+    }
+    default:
+      return null;
+  }
+}