midway-fatcms 0.0.1-beta.4 → 0.0.1-beta.41

package/src/libs/crud-pro/services/CrudProGenSqlService.ts

@@ -1,202 +0,0 @@
-import { CrudProServiceBase } from './CrudProServiceBase';
-import { CommonException, Exceptions } from '../exceptions';
-import { MixinUtils } from '../utils/MixinUtils';
-import {KeysOfSimpleSQL, KeysOfSqlResPicker, SqlDbType} from '../models/keys';
-import {RequestCfgModel} from "../models/RequestCfgModel";
-
-const { equalsIgnoreCase, isEmpty, isNotEmpty } = MixinUtils;
-
-class CrudProGenSqlService extends CrudProServiceBase {
-  public async generateSQLList() {
-    const exeCtx = this.getExecuteContext();
-    const reqCfg = exeCtx.getCfgModel();
-    const sqlSimpleName = reqCfg.sqlSimpleName;
-
-    // 简单模式
-    const isSimpleMode = isNotEmpty(sqlSimpleName) && sqlSimpleName.startsWith('SIMPLE_');
-
-    // 拼接简单模式的SQL
-    if (isSimpleMode) {
-      this.generateOriginSql();
-    }
-
-    await this.generateExecuteSql();
-  }
-
-  private generateOriginSql() {
-    const exeCtx = this.getExecuteContext();
-
-    const cfgModel = exeCtx.getCfgModel();
-    const simpleSqlName = cfgModel.sqlSimpleName;
-
-    // 只有当设置了simpleSqlName时，才启用内置的SQL生成
-    if (isEmpty(simpleSqlName)) {
-      return;
-    }
-
-    cfgModel.sqlCfgList = [];
-
-    let sql1 = null;
-    let sql2 = null;
-    let sql3 = null;
-    if (equalsIgnoreCase(KeysOfSimpleSQL.SIMPLE_QUERY, simpleSqlName)) {
-      sql1 = 'select @@columns from @@table where @@asWhere:condition @@orderBys @@offsetLimit';
-      cfgModel.addSqlCfgModel('rows', sql1);
-    } else if (equalsIgnoreCase(KeysOfSimpleSQL.SIMPLE_QUERY_ONE, simpleSqlName)) {
-      sql1 = 'select @@columns from @@table where @@asWhere:condition @@orderBys limit 1';
-      cfgModel.addSqlCfgModel('row', sql1, KeysOfSqlResPicker.RESULT_FIRST_ROW);
-    } else if (equalsIgnoreCase(KeysOfSimpleSQL.SIMPLE_QUERY_COUNT, simpleSqlName)) {
-      sql1 = 'select count(0) as total_count from @@table where @@asWhere:condition';
-
-      cfgModel.addSqlCfgModel('total_count', sql1, KeysOfSqlResPicker.RESULT_TOTAL_COUNT);
-    } else if (equalsIgnoreCase(KeysOfSimpleSQL.SIMPLE_QUERY_PAGE, simpleSqlName)) {
-      sql1 = 'select @@columns from @@table where @@asWhere:condition @@orderBys @@offsetLimit ';
-      sql2 = 'select count(0) as total_count from @@table where @@asWhere:condition';
-
-      cfgModel.addSqlCfgModel('rows', sql1);
-      cfgModel.addSqlCfgModel('total_count', sql2, KeysOfSqlResPicker.RESULT_TOTAL_COUNT);
-    } else if (equalsIgnoreCase(KeysOfSimpleSQL.SIMPLE_DELETE, simpleSqlName)) {
-      sql1 = this.generateOriginSqlForDelete(cfgModel);
-      cfgModel.addSqlCfgModel('affected', sql1, KeysOfSqlResPicker.UPDATE_RESULT);
-    } else if (equalsIgnoreCase(KeysOfSimpleSQL.SIMPLE_INSERT, simpleSqlName)) {
-      sql1 = this.generateOriginSqlForInsert(cfgModel);
-      cfgModel.addSqlCfgModel('affected', sql1, KeysOfSqlResPicker.UPDATE_RESULT);
-    } else if (equalsIgnoreCase(KeysOfSimpleSQL.SIMPLE_UPDATE, simpleSqlName)) {
-      sql1 = 'update @@table set @@asUpdate:data where @@asWhere:condition ';
-      cfgModel.addSqlCfgModel('affected', sql1, KeysOfSqlResPicker.UPDATE_RESULT);
-    } else if (equalsIgnoreCase(KeysOfSimpleSQL.SIMPLE_INSERT_ON_DUPLICATE_UPDATE, simpleSqlName)) {
-      sql1 = this.generateOriginSqlForDuplicateInsert(cfgModel);
-      cfgModel.addSqlCfgModel('affected', sql1, KeysOfSqlResPicker.UPDATE_RESULT);
-    } else if (equalsIgnoreCase(KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE, simpleSqlName)) {
-      sql1 = 'select count(0) as total_count from @@table where @@asWhere:condition ';
-      sql2 = 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data )';
-      sql3 = 'update @@table set @@asUpdate:data where @@asWhere:condition ';
-
-      const insertWhen2 = {
-        functionName: 'eq',
-        functionParams: [{ contextAsNumber: 'res.total_count' }, { constNumber: 0 }],
-      };
-      const updateWhen3 = {
-        functionName: 'gt',
-        functionParams: [{ contextAsNumber: 'res.total_count' }, { constNumber: 0 }],
-      };
-
-      cfgModel.addSqlCfgModel('total_count', sql1, KeysOfSqlResPicker.RESULT_TOTAL_COUNT);
-      cfgModel.addSqlCfgModel('insert_affected', sql2, KeysOfSqlResPicker.UPDATE_RESULT, insertWhen2);
-      cfgModel.addSqlCfgModel('update_affected', sql3, KeysOfSqlResPicker.UPDATE_RESULT, updateWhen3);
-    }
-
-    if (isEmpty(sql1)) {
-      throw new CommonException(Exceptions.CFG_NOT_SUPPORT_THE_SIMPLE_SQL, simpleSqlName);
-    }
-  }
-
-  /**
-   * 删除语句
-   * @param cfgModel
-   * @private
-   */
-  private generateOriginSqlForDelete(cfgModel: RequestCfgModel) : string {
-    if (cfgModel.sqlDdType === SqlDbType.postgres) {
-      return 'delete from @@table where @@asWhere:condition ';
-    }
-    if (cfgModel.sqlDdType === SqlDbType.sqlserver) {
-      return 'delete from @@table where @@asWhere:condition ';
-    }
-    return 'delete from @@table where @@asWhere:condition limit 100 '; // 删除操作，不能一次性删除太多
-  }
-
-  /**
-   * 创建插入OR更新语句
-   * @param cfgModel
-   * @private
-   */
-  private generateOriginSqlForDuplicateInsert(cfgModel: RequestCfgModel) : string {
-    if (cfgModel.sqlDdType === SqlDbType.postgres) {
-      const uniqueColumn = cfgModel.uniqueColumn ; // id
-      if (!Array.isArray(uniqueColumn) || uniqueColumn.length === 0) {
-        throw new CommonException(Exceptions.CFG_ERROR_POSTGRES_UNIQUE_COLUMNS_NULL)
-      }
-      const unique_column = uniqueColumn.map((s)=>{
-        return `"${s}"`;
-      }).join(",")
-      return `insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data ) ON CONFLICT (${unique_column}) DO UPDATE set @@asUpdate:data `; // 关键字的前后，必须有空格
-    }
-
-
-    if (cfgModel.sqlDdType === SqlDbType.sqlserver) {
-      const uniqueColumn = cfgModel.uniqueColumn ; // id
-      if (uniqueColumn.length !== 1) {
-        throw new CommonException(Exceptions.CFG_UNIQUE_COLUMN_COUNT_MUST_ONE);
-      }
-
-      const uniqueColumnStr = uniqueColumn[0];
-      const uniqueColumnVal = "@@data." + uniqueColumnStr;
-
-      const sql = "" +
-        `IF EXISTS (SELECT 1 FROM @@table WHERE [${uniqueColumnStr}] = ${uniqueColumnVal})` +
-        "BEGIN\n" +
-        "    UPDATE @@table\n" +
-        "    SET @@asUpdate:data\n" +
-        `    WHERE [${uniqueColumnStr}] = ${uniqueColumnVal} ;\n` +
-        "END\n" +
-        "ELSE\n" +
-        "BEGIN\n" +
-        "    INSERT INTO @@table ( @@asInsertKeys:data )\n" +
-        "    VALUES ( @@asInsertValues:data );\n" +
-        "END";
-
-      return sql;
-    }
-
-
-    return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data )  on duplicate key update @@asUpdate:data '; // 关键字的前后，必须有空格
-  }
-
-
-  /**
-   * 创建插入语句
-   * @param cfgModel
-   * @private
-   */
-  private generateOriginSqlForInsert(cfgModel: RequestCfgModel): string {
-    if (cfgModel.sqlDdType === SqlDbType.postgres) {
-      return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data ) RETURNING * ';
-    }
-    if (cfgModel.sqlDdType === SqlDbType.sqlserver) {
-      return 'insert into @@table ( @@asInsertKeys:data ) OUTPUT INSERTED.* values( @@asInsertValues:data ) ';
-    }
-    return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data )'; // 关键字的前后，必须有空格
-  }
-
-
-
-
-  private async generateExecuteSql() {
-    const exeCtx = this.getExecuteContext();
-
-    const reqCfgModel = exeCtx.getCfgModel();
-    const sqlCfgList = reqCfgModel.sqlCfgList || [];
-    const { sqlTable, sqlSchema, sqlDatabase, sqlDdType, maxLimit, columns, columnsRelation } = reqCfgModel;
-
-    for (let i = 0; i < sqlCfgList.length; i++) {
-      const sqlCfgModel = sqlCfgList[i];
-
-      sqlCfgModel.sqlDdType = MixinUtils.selectNotEmpty(sqlCfgModel.sqlDdType, sqlDdType);
-      sqlCfgModel.sqlDatabase = MixinUtils.selectNotEmpty(sqlCfgModel.sqlDatabase, sqlDatabase);
-      sqlCfgModel.sqlSchema = MixinUtils.selectNotEmpty(sqlCfgModel.sqlSchema, sqlSchema);
-      sqlCfgModel.sqlTable = MixinUtils.selectNotEmpty(sqlCfgModel.sqlTable, sqlTable);
-      sqlCfgModel.maxLimit = MixinUtils.selectNotEmpty(sqlCfgModel.maxLimit, maxLimit);
-      sqlCfgModel.columns = MixinUtils.selectNotEmpty(sqlCfgModel.columns, columns);
-      sqlCfgModel.columnsRelation = MixinUtils.selectNotEmpty(sqlCfgModel.columnsRelation, columnsRelation);
-
-      await this.serviceHub.convertOriginToExecuteSql(sqlCfgModel);
-
-      exeCtx.getSqlCfgModels().push(sqlCfgModel);
-    }
-  }
-
-
-}
-
-export { CrudProGenSqlService };

package/src/libs/crud-pro/services/CrudProOriginToExecuteSql.ts

@@ -1,397 +0,0 @@
-import {CrudProServiceBase} from './CrudProServiceBase';
-import {SqlCfgModel} from '../models/SqlCfgModel';
-import {MixinUtils} from '../utils/MixinUtils';
-import {SqlSegArg} from '../models/SqlSegArg';
-import {KeysOfCustomSQL, SqlDbType} from '../models/keys';
-import {RequestModel} from '../models/RequestModel';
-import {CommonException, Exceptions} from '../exceptions';
-import {RequestCfgModel} from '../models/RequestCfgModel';
-import {ModelUtils} from '../utils/ModelUtils';
-import {FuncContext} from '../models/FuncContext';
-import {TypeUtils} from '../utils/TypeUtils';
-import {sqlFuncUtils} from '../utils/SqlFuncUtils';
-import {toSqlColumnName, toSqlColumnNamesJoin} from '../utils/sqlConvert/convertColumnName';
-import {CrudProGenSqlCondition} from "./CrudProGenSqlCondition";
-
-const KEYS_CUSTOM_PATTERN = /@@[0-9a-zA-Z:._]+/gm;
-
-
-/**
- * 存在任何需要排除的
- * @param columns
- */
-function isAnyStartWithExclude(columns: string[]): boolean {
-  if (MixinUtils.isEmpty(columns)) {
-    return false;
-  }
-
-  for (let i = 0; i < columns.length; i++) {
-    const s = columns[i];
-    if (s.startsWith('!')) {
-      return true;
-    }
-  }
-  return false;
-}
-
-class CrudProOriginToExecuteSql extends CrudProServiceBase {
-  async convertOriginToExecuteSql(sqlCfgModel: SqlCfgModel) {
-    const originSql = sqlCfgModel.originSql;
-    if (MixinUtils.isEmpty(originSql)) {
-      // 允许配置中没有originSql，此时可能仅仅用来做校验逻辑
-      return;
-    }
-
-    if (MixinUtils.isNotEmpty(sqlCfgModel.executeSql)) {
-      //直接传递可执行SQL ，不需要再转换。
-      return;
-    }
-
-    const sqlArgModelMap = await this.generateWordMap(originSql, sqlCfgModel);
-
-    const argList = [];
-    let executeSql = originSql;
-
-
-    // 发现有需要被替换的变量。
-    if (sqlArgModelMap) {
-       executeSql = originSql.replace(KEYS_CUSTOM_PATTERN, word => {
-        if (!word) {
-          return '';
-        }
-        const sqlArgModel = sqlArgModelMap[word];
-
-        if (!sqlArgModel) {
-          return '';
-        }
-
-        if (MixinUtils.isNotEmpty(sqlArgModel.args) && Array.isArray(sqlArgModel.args)) {
-          argList.push(...sqlArgModel.args);
-        }
-
-        return sqlArgModel.sql;
-      });
-    }
-
-
-    sqlCfgModel.executeSqlArgs = argList;
-    sqlCfgModel.executeSql = executeSql;
-  }
-
-  private async generateWordMap(originSql: string, sqlCfgModel: SqlCfgModel): Promise<Record<string, SqlSegArg>> {
-    // ['@@columns', '@@table', '@@asWhere:condition', '@@orderBys']
-    const sqlKeywords = originSql.match(KEYS_CUSTOM_PATTERN);
-
-    // 没有需要被替换的变量。
-    if (!sqlKeywords || sqlKeywords.length === 0) {
-      return null;
-    }
-
-    const sqlKeywordArgModelMap = {};
-    for (let i = 0; i < sqlKeywords.length; i++) {
-      const word = sqlKeywords[i]; // @@columns
-      if (word) {
-        const sqlArgModel = await this.generateWord(word, sqlCfgModel);
-        if (sqlArgModel) {
-          sqlKeywordArgModelMap[word] = sqlArgModel;
-        }
-      }
-    }
-    return sqlKeywordArgModelMap;
-  }
-
-  private async generateWord(word: string, sqlCfg: SqlCfgModel): Promise<SqlSegArg> {
-    const exeCtx = this.getExecuteContext();
-    const reqCfg = exeCtx.getCfgModel();
-    const reqModel = exeCtx.getReqModel();
-
-    if (word === KeysOfCustomSQL.SQL_TABLE) {
-      return this.generateTable(reqCfg, sqlCfg);
-    } else if (word === KeysOfCustomSQL.SQL_COLUMNS) {
-      return this.generateColumns(reqCfg, sqlCfg, reqModel);
-    } else if (word.startsWith(KeysOfCustomSQL.SQL_AS_WHERE)) {
-      return this.generateCondition(reqModel, sqlCfg, MixinUtils.removeStringPrefix(word, KeysOfCustomSQL.SQL_AS_WHERE));
-    } else if (word === KeysOfCustomSQL.SQL_OFFSET_LIMIT) {
-      return this.generateOffsetLimit(reqCfg, sqlCfg, reqModel);
-    } else if (word === KeysOfCustomSQL.SQL_ORDER_BYS) {
-      return this.generateOrderBys(reqModel, sqlCfg);
-    } else if ((
-        word.startsWith(KeysOfCustomSQL.SQL_GET_DATA_ATTR_START) ||
-        word.startsWith(KeysOfCustomSQL.SQL_GET_CONDITION_ATTR_START)) && word.indexOf('.') > 0) {
-      return this.generateGetAttr(reqModel, word); //// data.xxx, condition.xxx
-    } else if (word.startsWith(KeysOfCustomSQL.SQL_PICK_RES_AS_NUMBER) || word.startsWith(KeysOfCustomSQL.SQL_PICK_RES_AS_STRING)) {
-      return this.generatePickResAs(reqModel,  word); //  @@pickResAsNumber:replies_count
-    } else if (word.startsWith(KeysOfCustomSQL.SQL_AS_UPDATE)) {
-      return this.generateDataUpdate(reqModel, sqlCfg, MixinUtils.removeStringPrefix(word, KeysOfCustomSQL.SQL_AS_UPDATE));
-    } else if (word.startsWith(KeysOfCustomSQL.SQL_AS_INSERT_KEYS)) {
-      return this.generateDataAsInsertKeys(reqModel, sqlCfg, MixinUtils.removeStringPrefix(word, KeysOfCustomSQL.SQL_AS_INSERT_KEYS));
-    } else if (word.startsWith(KeysOfCustomSQL.SQL_AS_INSERT_VALUES)) {
-      return this.generateDataAsInsertValues(reqModel, MixinUtils.removeStringPrefix(word, KeysOfCustomSQL.SQL_AS_INSERT_VALUES));
-    } else if (word.startsWith(KeysOfCustomSQL.SQL_FUNCTION)) {
-      return this.generateSqlJavaFunction(reqCfg, MixinUtils.removeStringPrefix(word, KeysOfCustomSQL.SQL_FUNCTION));
-    } else {
-      return new SqlSegArg(word.toString());
-    }
-  }
-
-  private generateDataAsInsertKeys(req: RequestModel, sqlCfgModel: SqlCfgModel, dataName: string): SqlSegArg {
-    const data = req.getCondOrDataJsonObject(dataName);
-
-    if (MixinUtils.isEmpty(data)) {
-      throw new CommonException(Exceptions.DATA_GET_DATA_EMPTY_ON_INSERT_KEYS, dataName);
-    }
-
-    const keys = Object.keys(data).sort();
-
-    const columnList = keys.map(columnName => {
-      return toSqlColumnName(columnName, sqlCfgModel);
-    });
-
-    const sql = columnList.join(','); // `column1`,`column2`,`column3`,
-    return new SqlSegArg(sql); // 只有sql，没有arg
-  }
-
-  private generateTable(requestCfg: RequestCfgModel, sqlCfgModel: SqlCfgModel): SqlSegArg {
-    const sqlTableName = ModelUtils.getSqlTable(sqlCfgModel, requestCfg);
-
-    if (MixinUtils.isEmpty(sqlTableName)) {
-      throw new CommonException(Exceptions.CFG_EMPTY_TABLE_NAME);
-    }
-
-    const sqlSchema = ModelUtils.getSqlSchema(sqlCfgModel, requestCfg);
-    if (MixinUtils.isNotEmpty(sqlSchema)) {
-      return new SqlSegArg(`${toSqlColumnName(sqlSchema, sqlCfgModel)}.${toSqlColumnName(sqlTableName, sqlCfgModel)}`);
-    }
-    return new SqlSegArg(toSqlColumnName(sqlTableName, sqlCfgModel));
-  }
-
-  private async generateColumns(cfg: RequestCfgModel, sqlCfgModel: SqlCfgModel, req: RequestModel): Promise<SqlSegArg> {
-    // req 和 cfg 都没有 columns字段
-    if (MixinUtils.isEmpty(cfg.columns) && MixinUtils.isEmpty(req.columns)) {
-      return new SqlSegArg('*');
-    }
-
-    const cfgColumns = await this.generateCfgColumns(sqlCfgModel); // 不会为空
-    const reqColumns = req.columns;
-
-    // req 为空
-    if (MixinUtils.isEmpty(reqColumns)) {
-      return new SqlSegArg(toSqlColumnNamesJoin(cfgColumns, sqlCfgModel));
-    }
-
-    // req 不为空：1. 排除法
-    // cfgColumns与reqColumns 都不为空： 使用排除法
-    if (isAnyStartWithExclude(reqColumns)) {
-      const result = [];
-      for (let i = 0; i < cfgColumns.length; i++) {
-        const cfgColumn = cfgColumns[i];
-        if (reqColumns.indexOf('!' + cfgColumn) < 0) {
-          result.push(cfgColumn);
-        }
-      }
-      return new SqlSegArg(toSqlColumnNamesJoin(result, sqlCfgModel));
-    }
-
-    // req 不为空：2. 取交集
-    const result = [];
-    for (let i = 0; i < reqColumns.length; i++) {
-      const reqColumn = reqColumns[i];
-      if (cfgColumns.indexOf(reqColumn) >= 0) {
-        result.push(reqColumn);
-      }
-    }
-    return new SqlSegArg(toSqlColumnNamesJoin(result,sqlCfgModel));
-  }
-
-  /**
-   * 生成查询条件
-   * @param req
-   * @param sqlCfg
-   * @param conditionName
-   * @private
-   */
-  private generateCondition(req: RequestModel, sqlCfg: SqlCfgModel, conditionName: any): SqlSegArg {
-    if (MixinUtils.isEmpty(conditionName)) {
-      conditionName = 'condition';
-    }
-    const condition = req.getCondOrDataJsonObject(conditionName);
-
-    const ss = new CrudProGenSqlCondition(sqlCfg);
-
-    return ss.generateCondition(condition);
-  }
-
-  private generateOffsetLimit(requestCfg: RequestCfgModel, sqlCfg: SqlCfgModel, req: RequestModel): SqlSegArg {
-    const maxLimit = ModelUtils.getMaxLimit(sqlCfg, requestCfg);
-    const reqLimit = req.limit;
-    const limit = Math.min(maxLimit, reqLimit);
-
-    if (sqlCfg.sqlDdType === SqlDbType.postgres) {
-      return new SqlSegArg(' LIMIT ? OFFSET ? ', [limit, req.offset]);
-    }
-
-    if (sqlCfg.sqlDdType === SqlDbType.sqlserver) {
-      return new SqlSegArg(' OFFSET ? ROWS FETCH NEXT ? ROWS ONLY ', [ req.offset, limit]);
-    }
-
-    return new SqlSegArg(' limit ?,? ', [req.offset, limit]);
-  }
-
-  // 生成排序条件
-  private generateOrderBys(req: RequestModel, sqlCfgModel: SqlCfgModel): SqlSegArg {
-    const orderBys = req.orderBys;
-    if (MixinUtils.isEmpty(orderBys)) {
-      return null;
-    }
-    const orderByArr = orderBys.map(orderBy => {
-      return toSqlColumnName(orderBy.fieldName, sqlCfgModel) + ' ' + orderBy.orderType;
-    });
-    const sql = 'order by ' + orderByArr.join(',');
-    return new SqlSegArg(sql);
-  }
-
-
-  private generatePickResAs(req: RequestModel, world: string): SqlSegArg {
-    return new SqlSegArg(' ? ', [{
-        ___GENERATE_GET_RES_ATTR___: world,
-    }]);
-  }
-
-  private generateGetAttr(req: RequestModel, word: string): SqlSegArg {
-    const attrName = MixinUtils.removeStringPrefix(word, '@@');
-
-    if (MixinUtils.isEmpty(attrName)) {
-      throw new CommonException(Exceptions.CFG_GET_ATTR_NAME_EMPTY, word);
-    }
-
-    const dataValue = req.getJsonObjectValue(attrName);
-
-    if (typeof dataValue === 'undefined' || !TypeUtils.isBasicType(dataValue)) {
-      throw new CommonException(Exceptions.CFG_GET_ATTR_VALUE_ERROR, word);
-    }
-
-    return new SqlSegArg(' ? ', [dataValue]);
-  }
-
-  private generateDataUpdate(req: RequestModel, sqlCfgModel: SqlCfgModel, dataName: string): SqlSegArg {
-    const data = req.getCondOrDataJsonObject(dataName);
-
-    if (MixinUtils.isEmpty(data)) {
-      throw new CommonException(Exceptions.DATA_GET_DATA_EMPTY_ON_UPDATE, dataName);
-    }
-
-    const keys = Object.keys(data).sort();
-
-    const sqlList = [];
-    const argList = [];
-
-    for (let i = 0; i < keys.length; i++) {
-      const key = keys[i];
-      const arg = data[key];
-      if (sqlFuncUtils.isSqlFuncArg(arg)) {
-        const funcSQL = sqlFuncUtils.toFuncSQL(arg);
-        sqlList.push(toSqlColumnName(key, sqlCfgModel) + '= ' + funcSQL);
-      } else {
-        sqlList.push(toSqlColumnName(key, sqlCfgModel) + '= ?');
-        argList.push(arg);
-      }
-    }
-
-    const sql = sqlList.join(',');
-    return new SqlSegArg(sql, argList);
-  }
-
-  private generateDataAsInsertValues(req: RequestModel, dataName: string): SqlSegArg {
-    const data = req.getCondOrDataJsonObject(dataName);
-
-    if (MixinUtils.isEmpty(data)) {
-      throw new CommonException(Exceptions.DATA_GET_DATA_EMPTY_ON_INSERT_VALUES, dataName);
-    }
-
-    const keys = Object.keys(data).sort();
-
-    const sqlList = [];
-    const argList = [];
-
-    for (let i = 0; i < keys.length; i++) {
-      const key = keys[i];
-      const arg = data[key];
-
-      // 如 data: {xxxTime: {$byFunc:"NOW()"}}
-      if (sqlFuncUtils.isSqlFuncArg(arg)) {
-        const funcSQL = sqlFuncUtils.toFuncSQL(arg); //  values( ? , ? , NOW() , ?)
-        sqlList.push(funcSQL);
-      } else {
-        sqlList.push('?');
-        argList.push(arg);
-      }
-    }
-
-    const sql = sqlList.join(','); // "?,?,?,?"
-    return new SqlSegArg(sql, argList);
-  }
-
-  private generateSqlJavaFunction(requestCfg: RequestCfgModel, tmpFuncName: string): SqlSegArg {
-    const exeCtx = this.getExecuteContext();
-
-    const functionCfg = requestCfg.functionCfg;
-
-    if (MixinUtils.isEmpty(functionCfg)) {
-      throw new CommonException(Exceptions.CFG_SQL_FUNCTION_EMPTY, tmpFuncName);
-    }
-
-    const tmpFunCfg = functionCfg[tmpFuncName];
-
-    if (ModelUtils.checkFuncCfgValid(tmpFunCfg)) {
-      throw new CommonException(Exceptions.CFG_VALIDATE_CUSTOM_FUNCTION_EMPTY, tmpFuncName);
-    }
-
-    const exeFunCtx = new FuncContext();
-
-    exeFunCtx.currentValue = null;
-    exeFunCtx.reqModel = exeCtx.getReqModel();
-    exeFunCtx.resModel = exeCtx.getResModel();
-
-    const dataValue = this.serviceHub.executeFuncCfg(tmpFunCfg, exeFunCtx);
-
-    return new SqlSegArg(' ? ', [dataValue]);
-  }
-
-  /**
-   * 不会返回空。
-   * @param sqlCfgModel
-   * @private
-   */
-  private async generateCfgColumns(sqlCfgModel: SqlCfgModel): Promise<string[]> {
-    const tableMeta = await this.serviceHub.getTableMeta(sqlCfgModel);
-
-    const tableColumns = tableMeta.tableColumns;
-    const cfgColumns = sqlCfgModel.columns || [];
-
-    // 没有配置: 全量
-    if (MixinUtils.isEmpty(cfgColumns)) {
-      return tableColumns;
-    }
-
-    // 黑名单：排除法
-    if (isAnyStartWithExclude(cfgColumns)) {
-      const excludeColumns = cfgColumns.filter(c => {
-        return c.startsWith('!');
-      });
-      const excludeColumnsSet = new Set(excludeColumns);
-      const result = [];
-      for (let i = 0; i < tableColumns.length; i++) {
-        const tableColumn = tableColumns[i];
-        if (!excludeColumnsSet.has('!' + tableColumn)) {
-          result.push(tableColumn);
-        }
-      }
-      return result;
-    }
-
-    // 白名单
-    return cfgColumns;
-  }
-}
-
-export { CrudProOriginToExecuteSql };

package/src/libs/crud-pro/services/CrudProServiceBase.ts

@@ -1,98 +0,0 @@
-import * as _ from 'lodash';
-import { ICurdProServiceHub } from '../models/ServiceHub';
-import {ICrudProCfg, ILogger, IPoolConnectionClient} from '../interfaces';
-import { SqlCfgModel } from '../models/SqlCfgModel';
-import { ExecuteContext } from '../models/ExecuteContext';
-import { MixinUtils } from '../utils/MixinUtils';
-import { TypeUtils } from '../utils/TypeUtils';
-import { CompareUtils } from '../utils/CompareUtils';
-import { DateTimeUtils } from '../utils/DateTimeUtils';
-import { IExecuteContextFunc } from '../models/ExecuteContextFunc';
-import { DEFAULT_MAX_LIMIT } from '../defaultConfigs';
-
-function createBuildInExecuteFuncMap() {
-  return {
-    ...DateTimeUtils,
-    ...CompareUtils,
-    ...MixinUtils,
-    ...TypeUtils,
-  };
-}
-
-interface ExecuteUnsafeQueryCtx {
-  tableName: string;
-  dbName: string;
-}
-
-const buildInExecuteFuncMap = createBuildInExecuteFuncMap();
-
-class CrudProServiceBase {
-  protected serviceHub: ICurdProServiceHub;
-
-  constructor(serviceHub: ICurdProServiceHub) {
-    this.serviceHub = serviceHub;
-  }
-
-  protected getExecuteContext(): ExecuteContext {
-    return this.serviceHub.getExecuteContext();
-  }
-
-  protected getContextFunc(): IExecuteContextFunc {
-    return this.getExecuteContext().contextFunc;
-  }
-
-  protected get logger(): ILogger {
-    return this.getExecuteContext().getLogger();
-  }
-
-  protected async getTxConnectionBySqlCfg(sqlCfgModel: SqlCfgModel): Promise<IPoolConnectionClient> {
-    const executeContext = this.getExecuteContext();
-    const transaction = executeContext.getTransaction();
-    const contextFunc = this.getContextFunc();
-    const pool = await contextFunc.getConnectionPool(sqlCfgModel);
-    return transaction.getTxConnection(pool);
-  }
-
-  /**
-   * 不做任何检验，直接执行SQL，只能CrudPro内部使用，不对外使用
-   * @param obj
-   * @param sql
-   * @param values
-   * @protected
-   */
-  protected async executeUnsafeQuery(obj: ExecuteUnsafeQueryCtx, sql: string, values?: any) {
-    const sqlCfgModel: any = {
-      sqlTable: obj.tableName,
-      sqlDatabase: obj.dbName,
-      columns: [],
-      columnsRelation: [],
-      maxLimit: DEFAULT_MAX_LIMIT,
-      resName: 'executeUnsafeQuery',
-      originSql: sql,
-      executeSql: sql,
-      executeSqlArgs: values,
-      crudType: null,
-    };
-    const connection = await this.getTxConnectionBySqlCfg(sqlCfgModel);
-    return await connection.query(sql, values);
-  }
-
-  protected getContextCfg(): ICrudProCfg {
-    return this.getExecuteContext().getContextCfg();
-  }
-
-  protected getExecuteFunction(funcName: string): any {
-    const contextFunc = this.getContextFunc();
-    const functionMap = contextFunc.getFunctionMap();
-    if (functionMap) {
-      const func = _.get(functionMap, funcName);
-      if (typeof func === 'function') {
-        return func;
-      }
-    }
-    console.log('buildInExecuteFuncMap', Object.keys(buildInExecuteFuncMap));
-    return _.get(buildInExecuteFuncMap, funcName);
-  }
-}
-
-export { CrudProServiceBase };