midway-fatcms 0.0.1-beta.76 → 0.0.1-beta.77

package/dist/libs/crud-pro/utils/ValidateUtils.js

@@ -1,165 +1,165 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateByCfgString = void 0;
-const moment = require("moment");
-const keys_1 = require("../models/keys");
-const exceptions_1 = require("../exceptions");
-const MixinUtils_1 = require("./MixinUtils");
-const TypeUtils_1 = require("./TypeUtils");
-const { isEmpty } = MixinUtils_1.MixinUtils;
-const validatorUtils = {
-    /**
-     * 字符串长度
-     * @param itemCfg
-     * @param itemValue
-     */
-    isLengthValid(itemCfg, itemValue) {
-        if (typeof itemValue === 'string') {
-            const cfgPart = itemCfg.substring(keys_1.KeysOfValidators.LENGTH.length);
-            return TypeUtils_1.TypeUtils.isNumberScaleValid(cfgPart, itemValue.length);
-        }
-        return false;
-    },
-    /**
-     * 数字范围
-     * @param itemCfg
-     * @param itemValue
-     */
-    isNumberScaleValid(itemCfg, itemValue) {
-        if (typeof itemValue === 'number') {
-            const cfgPart = itemCfg.substring(keys_1.KeysOfValidators.SCALE.length).trim();
-            return TypeUtils_1.TypeUtils.isNumberScaleValid(cfgPart, itemValue);
-        }
-        else if (TypeUtils_1.TypeUtils.isNumeric(itemValue)) {
-            const cfgPart = itemCfg.substring(keys_1.KeysOfValidators.SCALE.length).trim();
-            return TypeUtils_1.TypeUtils.isNumberScaleValid(cfgPart, Number(itemValue));
-        }
-        return false;
-    },
-    /**
-     * 正则表达式
-     * @param itemCfg
-     * @param itemValue
-     */
-    isRegExpValid(itemCfg, itemValue) {
-        if (typeof itemValue === 'string') {
-            const cfgPart = itemCfg.substring(keys_1.KeysOfValidators.REG_EXP.length);
-            const regexp = new RegExp(cfgPart);
-            return regexp.test(itemValue);
-        }
-        return false;
-    },
-    isMomentValid(itemCfg, itemValue) {
-        const cfgPart = itemCfg.substring(keys_1.KeysOfValidators.ENUM.length).trim();
-        return moment(itemValue, cfgPart, true).isValid();
-    },
-    isEnumValid(itemCfg, itemValue) {
-        const cfgPart = itemCfg.substring(keys_1.KeysOfValidators.ENUM.length).trim();
-        const cfgArr = cfgPart.split(','); // 1,2,3,4
-        const enumStrArr = cfgArr.map(s => s.trim()).filter(s => !!s);
-        // 枚举值的配置不能为空
-        if (isEmpty(enumStrArr)) {
-            throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_VALIDATE_ENUM_ERROR, itemCfg);
-        }
-        // 值：不能为空
-        if (itemValue == null) {
-            return false;
-        }
-        // 值：不能为空
-        const itemValueString = itemValue.toString();
-        if (isEmpty(itemValueString)) {
-            return false;
-        }
-        for (let i = 0; i < enumStrArr.length; i++) {
-            const enumStr = enumStrArr[i];
-            if (enumStr === itemValueString) {
-                return true;
-            }
-        }
-        return false;
-    },
-};
-function validateByCfgStringInner(validateCfg, itemValue) {
-    if (keys_1.KeysOfValidators.ARRAY === validateCfg) {
-        return itemValue !== null && Array.isArray(itemValue);
-    }
-    else if (keys_1.KeysOfValidators.ARRAY_STRING === validateCfg) {
-        return (itemValue !== null &&
-            Array.isArray(itemValue) &&
-            MixinUtils_1.MixinUtils.isElementAllMatch(itemValue, e => {
-                return typeof e === 'string';
-            }));
-    }
-    else if (keys_1.KeysOfValidators.ARRAY_NUMBER === validateCfg) {
-        return (itemValue !== null &&
-            Array.isArray(itemValue) &&
-            MixinUtils_1.MixinUtils.isElementAllMatch(itemValue, e => {
-                return typeof e === 'number';
-            }));
-    }
-    else if (keys_1.KeysOfValidators.OBJECT === validateCfg) {
-        return itemValue !== null && typeof itemValue === 'object';
-    }
-    else if (keys_1.KeysOfValidators.BOOLEAN === validateCfg) {
-        return TypeUtils_1.TypeUtils.isBoolean(itemValue);
-    }
-    else if (keys_1.KeysOfValidators.STRING === validateCfg) {
-        return TypeUtils_1.TypeUtils.isString(itemValue);
-    }
-    else if (keys_1.KeysOfValidators.INTEGER === validateCfg) {
-        return TypeUtils_1.TypeUtils.isInteger(itemValue);
-    }
-    else if (keys_1.KeysOfValidators.NUMBER === validateCfg) {
-        return TypeUtils_1.TypeUtils.isNumber(itemValue);
-    }
-    else if (keys_1.KeysOfValidators.NUMERIC === validateCfg) {
-        return TypeUtils_1.TypeUtils.isNumeric(itemValue);
-    }
-    else if (keys_1.KeysOfValidators.NAME === validateCfg) {
-        return TypeUtils_1.TypeUtils.isValidName(itemValue);
-    }
-    else if (keys_1.KeysOfValidators.PHONE_CN === validateCfg) {
-        return TypeUtils_1.TypeUtils.isChinesePhone(itemValue.toString());
-    }
-    else if (keys_1.KeysOfValidators.EMAIL === validateCfg) {
-        return TypeUtils_1.TypeUtils.isEmailStrValid(itemValue);
-    }
-    else if (validateCfg.startsWith(keys_1.KeysOfValidators.LENGTH)) {
-        return validatorUtils.isLengthValid(validateCfg, itemValue);
-    }
-    else if (validateCfg.startsWith(keys_1.KeysOfValidators.REG_EXP)) {
-        return validatorUtils.isRegExpValid(validateCfg, itemValue);
-    }
-    else if (validateCfg.startsWith(keys_1.KeysOfValidators.SCALE)) {
-        return validatorUtils.isNumberScaleValid(validateCfg, itemValue);
-    }
-    else if (validateCfg.startsWith(keys_1.KeysOfValidators.ENUM)) {
-        return validatorUtils.isEnumValid(validateCfg, itemValue);
-    }
-    else if (validateCfg.startsWith(keys_1.KeysOfValidators.MOMENT)) {
-        return validatorUtils.isMomentValid(validateCfg, itemValue);
-    }
-    throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_VALIDATE_NOT_SUPPORT, validateCfg);
-}
-function validateByCfgString(validateCfg, itemValue, errPath) {
-    if (isEmpty(validateCfg)) {
-        // 没有配置，不需要校验
-        return;
-    }
-    // 必填
-    if ('required' === validateCfg) {
-        if (isEmpty(itemValue)) {
-            throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_ERR, "'参数校验错误，字段 " + errPath + ' 不满足校验配置：' + validateCfg);
-        }
-        return;
-    }
-    // 没有填写的话，不需要校验。
-    if (isEmpty(itemValue)) {
-        return;
-    }
-    // 校验失败
-    if (!validateByCfgStringInner(validateCfg, itemValue)) {
-        throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_ERR, "'参数校验错误，字段 " + errPath + ' 不满足校验配置：' + validateCfg);
-    }
-}
-exports.validateByCfgString = validateByCfgString;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateByCfgString = void 0;
+const moment = require("moment");
+const keys_1 = require("../models/keys");
+const exceptions_1 = require("../exceptions");
+const MixinUtils_1 = require("./MixinUtils");
+const TypeUtils_1 = require("./TypeUtils");
+const { isEmpty } = MixinUtils_1.MixinUtils;
+const validatorUtils = {
+    /**
+     * 字符串长度
+     * @param itemCfg
+     * @param itemValue
+     */
+    isLengthValid(itemCfg, itemValue) {
+        if (typeof itemValue === 'string') {
+            const cfgPart = itemCfg.substring(keys_1.KeysOfValidators.LENGTH.length);
+            return TypeUtils_1.TypeUtils.isNumberScaleValid(cfgPart, itemValue.length);
+        }
+        return false;
+    },
+    /**
+     * 数字范围
+     * @param itemCfg
+     * @param itemValue
+     */
+    isNumberScaleValid(itemCfg, itemValue) {
+        if (typeof itemValue === 'number') {
+            const cfgPart = itemCfg.substring(keys_1.KeysOfValidators.SCALE.length).trim();
+            return TypeUtils_1.TypeUtils.isNumberScaleValid(cfgPart, itemValue);
+        }
+        else if (TypeUtils_1.TypeUtils.isNumeric(itemValue)) {
+            const cfgPart = itemCfg.substring(keys_1.KeysOfValidators.SCALE.length).trim();
+            return TypeUtils_1.TypeUtils.isNumberScaleValid(cfgPart, Number(itemValue));
+        }
+        return false;
+    },
+    /**
+     * 正则表达式
+     * @param itemCfg
+     * @param itemValue
+     */
+    isRegExpValid(itemCfg, itemValue) {
+        if (typeof itemValue === 'string') {
+            const cfgPart = itemCfg.substring(keys_1.KeysOfValidators.REG_EXP.length);
+            const regexp = new RegExp(cfgPart);
+            return regexp.test(itemValue);
+        }
+        return false;
+    },
+    isMomentValid(itemCfg, itemValue) {
+        const cfgPart = itemCfg.substring(keys_1.KeysOfValidators.ENUM.length).trim();
+        return moment(itemValue, cfgPart, true).isValid();
+    },
+    isEnumValid(itemCfg, itemValue) {
+        const cfgPart = itemCfg.substring(keys_1.KeysOfValidators.ENUM.length).trim();
+        const cfgArr = cfgPart.split(','); // 1,2,3,4
+        const enumStrArr = cfgArr.map(s => s.trim()).filter(s => !!s);
+        // 枚举值的配置不能为空
+        if (isEmpty(enumStrArr)) {
+            throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_VALIDATE_ENUM_ERROR, itemCfg);
+        }
+        // 值：不能为空
+        if (itemValue == null) {
+            return false;
+        }
+        // 值：不能为空
+        const itemValueString = itemValue.toString();
+        if (isEmpty(itemValueString)) {
+            return false;
+        }
+        for (let i = 0; i < enumStrArr.length; i++) {
+            const enumStr = enumStrArr[i];
+            if (enumStr === itemValueString) {
+                return true;
+            }
+        }
+        return false;
+    },
+};
+function validateByCfgStringInner(validateCfg, itemValue) {
+    if (keys_1.KeysOfValidators.ARRAY === validateCfg) {
+        return itemValue !== null && Array.isArray(itemValue);
+    }
+    else if (keys_1.KeysOfValidators.ARRAY_STRING === validateCfg) {
+        return (itemValue !== null &&
+            Array.isArray(itemValue) &&
+            MixinUtils_1.MixinUtils.isElementAllMatch(itemValue, e => {
+                return typeof e === 'string';
+            }));
+    }
+    else if (keys_1.KeysOfValidators.ARRAY_NUMBER === validateCfg) {
+        return (itemValue !== null &&
+            Array.isArray(itemValue) &&
+            MixinUtils_1.MixinUtils.isElementAllMatch(itemValue, e => {
+                return typeof e === 'number';
+            }));
+    }
+    else if (keys_1.KeysOfValidators.OBJECT === validateCfg) {
+        return itemValue !== null && typeof itemValue === 'object';
+    }
+    else if (keys_1.KeysOfValidators.BOOLEAN === validateCfg) {
+        return TypeUtils_1.TypeUtils.isBoolean(itemValue);
+    }
+    else if (keys_1.KeysOfValidators.STRING === validateCfg) {
+        return TypeUtils_1.TypeUtils.isString(itemValue);
+    }
+    else if (keys_1.KeysOfValidators.INTEGER === validateCfg) {
+        return TypeUtils_1.TypeUtils.isInteger(itemValue);
+    }
+    else if (keys_1.KeysOfValidators.NUMBER === validateCfg) {
+        return TypeUtils_1.TypeUtils.isNumber(itemValue);
+    }
+    else if (keys_1.KeysOfValidators.NUMERIC === validateCfg) {
+        return TypeUtils_1.TypeUtils.isNumeric(itemValue);
+    }
+    else if (keys_1.KeysOfValidators.NAME === validateCfg) {
+        return TypeUtils_1.TypeUtils.isValidName(itemValue);
+    }
+    else if (keys_1.KeysOfValidators.PHONE_CN === validateCfg) {
+        return TypeUtils_1.TypeUtils.isChinesePhone(itemValue.toString());
+    }
+    else if (keys_1.KeysOfValidators.EMAIL === validateCfg) {
+        return TypeUtils_1.TypeUtils.isEmailStrValid(itemValue);
+    }
+    else if (validateCfg.startsWith(keys_1.KeysOfValidators.LENGTH)) {
+        return validatorUtils.isLengthValid(validateCfg, itemValue);
+    }
+    else if (validateCfg.startsWith(keys_1.KeysOfValidators.REG_EXP)) {
+        return validatorUtils.isRegExpValid(validateCfg, itemValue);
+    }
+    else if (validateCfg.startsWith(keys_1.KeysOfValidators.SCALE)) {
+        return validatorUtils.isNumberScaleValid(validateCfg, itemValue);
+    }
+    else if (validateCfg.startsWith(keys_1.KeysOfValidators.ENUM)) {
+        return validatorUtils.isEnumValid(validateCfg, itemValue);
+    }
+    else if (validateCfg.startsWith(keys_1.KeysOfValidators.MOMENT)) {
+        return validatorUtils.isMomentValid(validateCfg, itemValue);
+    }
+    throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_VALIDATE_NOT_SUPPORT, validateCfg);
+}
+function validateByCfgString(validateCfg, itemValue, errPath) {
+    if (isEmpty(validateCfg)) {
+        // 没有配置，不需要校验
+        return;
+    }
+    // 必填
+    if ('required' === validateCfg) {
+        if (isEmpty(itemValue)) {
+            throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_ERR, "'参数校验错误，字段 " + errPath + ' 不满足校验配置：' + validateCfg);
+        }
+        return;
+    }
+    // 没有填写的话，不需要校验。
+    if (isEmpty(itemValue)) {
+        return;
+    }
+    // 校验失败
+    if (!validateByCfgStringInner(validateCfg, itemValue)) {
+        throw new exceptions_1.CommonException(exceptions_1.Exceptions.VALIDATE_ERR, "'参数校验错误，字段 " + errPath + ' 不满足校验配置：' + validateCfg);
+    }
+}
+exports.validateByCfgString = validateByCfgString;

package/dist/libs/crud-pro/utils/pool/MySQLUtils.d.ts

@@ -1,3 +1,3 @@
-import { IConnectionPool } from '../../interfaces';
-declare function getConnectionPool(poolName: string, poolOptions: any): IConnectionPool;
-export { getConnectionPool };
+import { IConnectionPool } from '../../interfaces';
+declare function getConnectionPool(poolName: string, poolOptions: any): IConnectionPool;
+export { getConnectionPool };

package/dist/libs/crud-pro/utils/pool/MySQLUtils.js

@@ -1,19 +1,19 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConnectionPool = void 0;
-const promise_1 = require("mysql2/promise");
-const keys_1 = require("../../models/keys");
-const POOL_CACHE_MAP = {};
-function getConnectionPool(poolName, poolOptions) {
-    let pool = POOL_CACHE_MAP[poolName];
-    if (!pool) {
-        pool = {
-            dbType: keys_1.SqlDbType.mysql,
-            poolName: poolName,
-            poolInstance: (0, promise_1.createPool)(poolOptions),
-        };
-        POOL_CACHE_MAP[poolName] = pool;
-    }
-    return pool;
-}
-exports.getConnectionPool = getConnectionPool;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConnectionPool = void 0;
+const promise_1 = require("mysql2/promise");
+const keys_1 = require("../../models/keys");
+const POOL_CACHE_MAP = {};
+function getConnectionPool(poolName, poolOptions) {
+    let pool = POOL_CACHE_MAP[poolName];
+    if (!pool) {
+        pool = {
+            dbType: keys_1.SqlDbType.mysql,
+            poolName: poolName,
+            poolInstance: (0, promise_1.createPool)(poolOptions),
+        };
+        POOL_CACHE_MAP[poolName] = pool;
+    }
+    return pool;
+}
+exports.getConnectionPool = getConnectionPool;

package/dist/libs/crud-pro/utils/pool/PostgresUtils.d.ts

@@ -1,3 +1,3 @@
-import { IConnectionPool } from '../../interfaces';
-declare function getConnectionPool(poolName: string, poolOptions: any): IConnectionPool;
-export { getConnectionPool };
+import { IConnectionPool } from '../../interfaces';
+declare function getConnectionPool(poolName: string, poolOptions: any): IConnectionPool;
+export { getConnectionPool };

package/dist/libs/crud-pro/utils/pool/PostgresUtils.js

@@ -1,20 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConnectionPool = void 0;
-const pg_1 = require("pg");
-const keys_1 = require("../../models/keys");
-const POOL_CACHE_MAP = {};
-function getConnectionPool(poolName, poolOptions) {
-    let pool = POOL_CACHE_MAP[poolName];
-    if (!pool) {
-        const poolObj = new pg_1.Pool(poolOptions);
-        pool = {
-            dbType: keys_1.SqlDbType.postgres,
-            poolName: poolName,
-            poolInstance: poolObj,
-        };
-        POOL_CACHE_MAP[poolName] = pool;
-    }
-    return pool;
-}
-exports.getConnectionPool = getConnectionPool;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConnectionPool = void 0;
+const pg_1 = require("pg");
+const keys_1 = require("../../models/keys");
+const POOL_CACHE_MAP = {};
+function getConnectionPool(poolName, poolOptions) {
+    let pool = POOL_CACHE_MAP[poolName];
+    if (!pool) {
+        const poolObj = new pg_1.Pool(poolOptions);
+        pool = {
+            dbType: keys_1.SqlDbType.postgres,
+            poolName: poolName,
+            poolInstance: poolObj,
+        };
+        POOL_CACHE_MAP[poolName] = pool;
+    }
+    return pool;
+}
+exports.getConnectionPool = getConnectionPool;

package/dist/libs/crud-pro/utils/pool/SqlServerUtils.d.ts

@@ -1,3 +1,3 @@
-import { IConnectionPool } from '../../interfaces';
-declare function getConnectionPool(poolName: string, poolOptions: any): IConnectionPool;
-export { getConnectionPool };
+import { IConnectionPool } from '../../interfaces';
+declare function getConnectionPool(poolName: string, poolOptions: any): IConnectionPool;
+export { getConnectionPool };

package/dist/libs/crud-pro/utils/pool/SqlServerUtils.js

@@ -1,20 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConnectionPool = void 0;
-const mssql_1 = require("mssql");
-const keys_1 = require("../../models/keys");
-const POOL_CACHE_MAP = {};
-function getConnectionPool(poolName, poolOptions) {
-    let pool = POOL_CACHE_MAP[poolName];
-    if (!pool) {
-        const poolObj = new mssql_1.ConnectionPool(poolOptions);
-        pool = {
-            dbType: keys_1.SqlDbType.sqlserver,
-            poolName: poolName,
-            poolInstance: poolObj,
-        };
-        POOL_CACHE_MAP[poolName] = pool;
-    }
-    return pool;
-}
-exports.getConnectionPool = getConnectionPool;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConnectionPool = void 0;
+const mssql_1 = require("mssql");
+const keys_1 = require("../../models/keys");
+const POOL_CACHE_MAP = {};
+function getConnectionPool(poolName, poolOptions) {
+    let pool = POOL_CACHE_MAP[poolName];
+    if (!pool) {
+        const poolObj = new mssql_1.ConnectionPool(poolOptions);
+        pool = {
+            dbType: keys_1.SqlDbType.sqlserver,
+            poolName: poolName,
+            poolInstance: poolObj,
+        };
+        POOL_CACHE_MAP[poolName] = pool;
+    }
+    return pool;
+}
+exports.getConnectionPool = getConnectionPool;

package/dist/libs/crud-pro/utils/sqlConvert/convertColumnName.d.ts

@@ -1,4 +1,4 @@
-import { SqlCfgModel } from '../../models/SqlCfgModel';
-declare function toSqlColumnName(columnName: string, sqlCfgModel: SqlCfgModel): string;
-declare function toSqlColumnNamesJoin(columns: string[], sqlCfgModel: SqlCfgModel): string;
-export { toSqlColumnName, toSqlColumnNamesJoin };
+import { SqlCfgModel } from '../../models/SqlCfgModel';
+declare function toSqlColumnName(columnName: string, sqlCfgModel: SqlCfgModel): string;
+declare function toSqlColumnNamesJoin(columns: string[], sqlCfgModel: SqlCfgModel): string;
+export { toSqlColumnName, toSqlColumnNamesJoin };

package/dist/libs/crud-pro/utils/sqlConvert/convertColumnName.js

@@ -1,35 +1,35 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.toSqlColumnNamesJoin = exports.toSqlColumnName = void 0;
-const exceptions_1 = require("../../exceptions");
-const keys_1 = require("../../models/keys");
-const COLUMN_NAME_REGEX = /^[a-zA-Z0-9_]+$/;
-function isColumnNameValid(str) {
-    if (typeof str !== 'string') {
-        return false;
-    }
-    if (str === '') {
-        return false;
-    }
-    return COLUMN_NAME_REGEX.test(str);
-}
-function toSqlColumnName(columnName, sqlCfgModel) {
-    if (!isColumnNameValid(columnName)) {
-        throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_ERROR_POSTGRES_COLUMN_NAME_INVALID, 'column name is invalid : ' + columnName);
-    }
-    if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
-        return '"' + columnName + '"';
-    }
-    if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
-        return '[' + columnName + ']';
-    }
-    return '`' + columnName + '`';
-}
-exports.toSqlColumnName = toSqlColumnName;
-function toSqlColumnNamesJoin(columns, sqlCfgModel) {
-    const columns2 = columns.map(col => {
-        return toSqlColumnName(col.trim(), sqlCfgModel);
-    });
-    return columns2.join(',');
-}
-exports.toSqlColumnNamesJoin = toSqlColumnNamesJoin;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toSqlColumnNamesJoin = exports.toSqlColumnName = void 0;
+const exceptions_1 = require("../../exceptions");
+const keys_1 = require("../../models/keys");
+const COLUMN_NAME_REGEX = /^[a-zA-Z0-9_]+$/;
+function isColumnNameValid(str) {
+    if (typeof str !== 'string') {
+        return false;
+    }
+    if (str === '') {
+        return false;
+    }
+    return COLUMN_NAME_REGEX.test(str);
+}
+function toSqlColumnName(columnName, sqlCfgModel) {
+    if (!isColumnNameValid(columnName)) {
+        throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_ERROR_POSTGRES_COLUMN_NAME_INVALID, 'column name is invalid : ' + columnName);
+    }
+    if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
+        return '"' + columnName + '"';
+    }
+    if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
+        return '[' + columnName + ']';
+    }
+    return '`' + columnName + '`';
+}
+exports.toSqlColumnName = toSqlColumnName;
+function toSqlColumnNamesJoin(columns, sqlCfgModel) {
+    const columns2 = columns.map(col => {
+        return toSqlColumnName(col.trim(), sqlCfgModel);
+    });
+    return columns2.join(',');
+}
+exports.toSqlColumnNamesJoin = toSqlColumnNamesJoin;

package/dist/libs/crud-pro/utils/sqlConvert/convertMix.d.ts

@@ -1,3 +0,0 @@
-import { SqlDbType } from '../../models/keys';
-declare function pickAndConvertRowsByMix(connectionQueryRes: any, sqlDbType: SqlDbType): any[] | any;
-export { pickAndConvertRowsByMix };

package/dist/libs/crud-pro/utils/sqlConvert/convertMix.js

@@ -1,22 +1,24 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pickAndConvertRowsByMix = void 0;
-const keys_1 = require("../../models/keys");
-const convertPgType_1 = require("./convertPgType");
-const _ = require("lodash");
-function pickAndConvertRowsByMix(connectionQueryRes, sqlDbType) {
-    if (!connectionQueryRes) {
-        throw new Error('[pickAndConvertRowsByMix] error, connectionQueryRes is null ');
-    }
-    if (sqlDbType === keys_1.SqlDbType.postgres) {
-        return (0, convertPgType_1.pickAndConvertPgRows)(connectionQueryRes);
-    }
-    if (sqlDbType === keys_1.SqlDbType.mysql) {
-        return connectionQueryRes[0];
-    }
-    if (sqlDbType === keys_1.SqlDbType.sqlserver) {
-        return _.get(connectionQueryRes, 'recordsets[0]') || [];
-    }
-    throw new Error('[pickAndConvertRowsByMix] error sqlDbType, sqlDbType = ' + sqlDbType);
-}
-exports.pickAndConvertRowsByMix = pickAndConvertRowsByMix;
+// import { SqlDbType } from '../../models/keys';
+// import { pickAndConvertPgRows } from './convertPgType';
+// import * as _ from 'lodash';
+//
+// function pickAndConvertRowsByMix(connectionQueryRes: any, sqlDbType: SqlDbType): any[] | any {
+//   if (!connectionQueryRes) {
+//     throw new Error('[pickAndConvertRowsByMix] error, connectionQueryRes is null ');
+//   }
+//
+//   if (sqlDbType === SqlDbType.postgres) {
+//     return pickAndConvertPgRows(connectionQueryRes);
+//   }
+//
+//   if (sqlDbType === SqlDbType.mysql) {
+//     return connectionQueryRes[0];
+//   }
+//
+//   if (sqlDbType === SqlDbType.sqlserver) {
+//     return _.get(connectionQueryRes, 'recordsets[0]') || [];
+//   }
+//   throw new Error('[pickAndConvertRowsByMix] error sqlDbType, sqlDbType = ' + sqlDbType);
+// }
+//
+// export { pickAndConvertRowsByMix };

package/dist/libs/crud-pro/utils/sqlConvert/convertMsSql.d.ts

@@ -1,2 +1,2 @@
-declare function replaceQuestionMarksForMssql(sql: string, isNativeSQL: boolean): string;
-export { replaceQuestionMarksForMssql };
+declare function replaceQuestionMarksForMssql(sql: string, isNativeSQL: boolean): string;
+export { replaceQuestionMarksForMssql };

package/dist/libs/crud-pro/utils/sqlConvert/convertMsSql.js

@@ -1,14 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceQuestionMarksForMssql = void 0;
-function replaceQuestionMarksForMssql(sql, isNativeSQL) {
-    if (isNativeSQL === true) {
-        return sql;
-    }
-    let count = 0;
-    return sql.replace(/\?/g, () => {
-        count = count + 1;
-        return `@fatcms_ms${count}`;
-    });
-}
-exports.replaceQuestionMarksForMssql = replaceQuestionMarksForMssql;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.replaceQuestionMarksForMssql = void 0;
+function replaceQuestionMarksForMssql(sql, isNativeSQL) {
+    if (isNativeSQL === true) {
+        return sql;
+    }
+    let count = 0;
+    return sql.replace(/\?/g, () => {
+        count = count + 1;
+        return `@fatcms_ms${count}`;
+    });
+}
+exports.replaceQuestionMarksForMssql = replaceQuestionMarksForMssql;