midway-fatcms 0.0.1-beta.5 → 0.0.1-beta.51

package/dist/libs/crud-pro/models/ExecuteContextFunc.js

@@ -54,6 +54,14 @@ class BaseExecuteContextFunc {
     afterExecuteSQLList() {
         return null;
     }
+    /**
+     * 在执行之前可以根据业务需要修改需要执行的内容
+     * @param reqJson
+     * @param cfgJson
+     */
+    beforeExecuteSQLList(reqJson, cfgJson) {
+        return Promise.resolve();
+    }
     getExecuteContext() {
         return this.executeContext;
     }

package/dist/libs/crud-pro/models/RequestCfgModel.d.ts

@@ -13,7 +13,7 @@ declare class RequestCfgModel {
     sqlTable: string;
     sqlSchema?: string;
     sqlDatabase?: string;
-    sqlDdType?: SqlDbType;
+    sqlDbType?: SqlDbType;
     maxLimit: number;
     method: string;
     transactionEnable: boolean;

package/dist/libs/crud-pro/models/ResModel.d.ts

@@ -0,0 +1,16 @@
+interface ResModelAffected {
+    insertId?: string | number;
+    affectedRows: number;
+}
+interface ResModelStandard {
+    row?: any;
+    rows?: any[];
+    total_count?: number;
+    affected?: ResModelAffected;
+    insert_affected?: ResModelAffected;
+    update_affected?: ResModelAffected;
+}
+declare type ResModelFlexible = ResModelStandard & {
+    [key: string]: any;
+};
+export { ResModelAffected, ResModelStandard, ResModelFlexible };

package/dist/libs/crud-pro/models/ResModel.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/libs/crud-pro/models/SqlCfgModel.d.ts

@@ -6,7 +6,7 @@ declare class SqlCfgModel {
     sqlTable: string;
     sqlSchema?: string;
     sqlDatabase?: string;
-    sqlDdType?: SqlDbType;
+    sqlDbType?: SqlDbType;
     maxLimit: number;
     resName: string;
     resPicker: KeysOfSqlResPicker;

package/dist/libs/crud-pro/models/Transaction.d.ts

@@ -3,6 +3,7 @@ declare class Transaction {
     private transactionMySQL;
     private transactionPostgres;
     private transactionSqlServer;
+    private isReleased;
     private getTxObj;
     /**
      * 获取链接对象

package/dist/libs/crud-pro/models/Transaction.js

@@ -10,6 +10,7 @@ class Transaction {
         this.transactionMySQL = new TransactionMySQL_1.TransactionMySQL();
         this.transactionPostgres = new TransactionPostgres_1.TransactionPostgres();
         this.transactionSqlServer = new TransactionSqlServer_1.TransactionSqlServer();
+        this.isReleased = false;
     }
     getTxObj(pool) {
         if (pool.dbType === keys_1.SqlDbType.postgres) {
@@ -28,6 +29,11 @@ class Transaction {
      * @param pool
      */
     async getTxConnection(pool) {
+        if (this.isReleased) {
+            const msg = '[Transaction] getTxConnection error, the txObject is isReleased, please check your code . DB request must be await';
+            console.error(msg);
+            throw new Error(msg);
+        }
         const txObj = this.getTxObj(pool);
         return txObj.getTxConnection(pool);
     }
@@ -62,6 +68,7 @@ class Transaction {
         await this.transactionMySQL.releaseTx();
         await this.transactionPostgres.releaseTx();
         await this.transactionSqlServer.releaseTx();
+        this.isReleased = true;
     }
 }
 exports.Transaction = Transaction;

package/dist/libs/crud-pro/models/TransactionSqlServer.js

@@ -39,7 +39,7 @@ class TransactionSqlServer {
                     }
                 }
                 return request.query(sql);
-            }
+            },
         };
     }
     /**

package/dist/libs/crud-pro/services/CrudProCachedCfgService.d.ts

@@ -4,6 +4,7 @@ import { ICurdProServiceHub } from '../models/ServiceHub';
 declare class CrudProCachedCfgService extends CrudProServiceBase {
     constructor(serviceHub: ICurdProServiceHub);
     getCachedCfgByMethod(method: string, isEnableCache: boolean): Promise<IRequestCfgModel | null>;
+    private getCachedCfgByMethodInner;
     private loadMethodInfo;
     private loadMethodInfoList;
 }

package/dist/libs/crud-pro/services/CrudProCachedCfgService.js

@@ -4,6 +4,7 @@ exports.CrudProCachedCfgService = void 0;
 const humps_1 = require("humps");
 const CrudProServiceBase_1 = require("./CrudProServiceBase");
 const MixinUtils_1 = require("../utils/MixinUtils");
+const convertMix_1 = require("../utils/sqlConvert/convertMix");
 const MemoryRefreshCache_1 = require("../utils/MemoryRefreshCache");
 const methodCache = new MemoryRefreshCache_1.default();
 function parseMethodInfo(methodInfo) {
@@ -17,42 +18,53 @@ class CrudProCachedCfgService extends CrudProServiceBase_1.CrudProServiceBase {
         super(serviceHub);
     }
     async getCachedCfgByMethod(method, isEnableCache) {
+        const methodInfo = await this.getCachedCfgByMethodInner(method, isEnableCache);
+        if (!methodInfo) {
+            return null;
+        }
+        return { ...methodInfo };
+    }
+    async getCachedCfgByMethodInner(method, isEnableCache) {
         // 不使用缓存
         if (!isEnableCache) {
             return await this.loadMethodInfo(method);
         }
         methodCache.setProps({
-            keepTime: 2000,
+            keepTime: 1000 * 60 * 2,
             requestFn: () => this.loadMethodInfoList(),
             getKeyFn: item => item.method,
         });
-        return await methodCache.getItem(method);
+        const methodInfo = await methodCache.getItem(method);
+        if (methodInfo) {
+            return methodInfo;
+        }
+        return await this.loadMethodInfo(method);
     }
     async loadMethodInfo(method) {
-        const { methodsTableName, sysDatabaseName } = this.getContextCfg();
-        const sql = `select *
-                 from ${methodsTableName}
-                 where method = ? `; // 全部加载到内存
+        const { methodsTableName, sysDatabaseName, sysDatabaseDbType } = this.getContextCfg();
+        const sql = `select * from ${methodsTableName} where method = ? `; // 全部加载到内存
         const baseInfo = {
-            tableName: methodsTableName,
-            dbName: sysDatabaseName,
+            sqlTable: methodsTableName,
+            sqlDatabase: sysDatabaseName,
+            sqlDbType: sysDatabaseDbType,
         };
-        const [rows] = await this.executeUnsafeQuery(baseInfo, sql, [method]);
-        const rows2 = rows;
+        const queryRes = await this.executeUnsafeQuery(baseInfo, sql, [method]);
+        const rows2 = (0, convertMix_1.pickAndConvertRowsByMix)(queryRes, sysDatabaseDbType);
         if (rows2.length > 0) {
             return parseMethodInfo(rows2[0]);
         }
         return null;
     }
     async loadMethodInfoList() {
-        const { methodsTableName, sysDatabaseName } = this.getContextCfg();
+        const { methodsTableName, sysDatabaseName, sysDatabaseDbType } = this.getContextCfg();
         const sql = `select * from ${methodsTableName}`; // 全部加载到内存
         const baseInfo = {
-            tableName: methodsTableName,
-            dbName: sysDatabaseName,
+            sqlTable: methodsTableName,
+            sqlDatabase: sysDatabaseName,
+            sqlDbType: sysDatabaseDbType,
         };
-        const [rows] = await this.executeUnsafeQuery(baseInfo, sql);
-        const rows2 = rows;
+        const queryRes = await this.executeUnsafeQuery(baseInfo, sql);
+        const rows2 = (0, convertMix_1.pickAndConvertRowsByMix)(queryRes, sysDatabaseDbType);
         return rows2.map(row => {
             return parseMethodInfo(row);
         });

package/dist/libs/crud-pro/services/CrudProExecuteSqlService.js

@@ -5,7 +5,7 @@ const _ = require("lodash");
 const CrudProServiceBase_1 = require("./CrudProServiceBase");
 const keys_1 = require("../models/keys");
 const exceptions_1 = require("../exceptions");
-const convertPgType_1 = require("../utils/sqlConvert/convertPgType");
+const convertMix_1 = require("../utils/sqlConvert/convertMix");
 const convertPgSql_1 = require("../utils/sqlConvert/convertPgSql");
 const convertMsSql_1 = require("../utils/sqlConvert/convertMsSql");
 const ModelUtils_1 = require("../utils/ModelUtils");
@@ -30,47 +30,45 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
         const exeCtx = this.getExecuteContext();
         const connection = await this.getTxConnectionBySqlCfg(sqlCfgModel);
         const executeSqlArgs = this.handleExecuteSqlArgsByResModel(exeCtx, sqlCfgModel.executeSqlArgs || []);
-        let sqlRes;
         let queryRes;
-        if (sqlCfgModel.sqlDdType === keys_1.SqlDbType.postgres) { // import { PoolClient } from 'pg';
+        if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
+            // import { PoolClient } from 'pg';
             const pgClient = connection;
             const pgSql = (0, convertPgSql_1.replaceQuestionMarks)(sqlCfgModel.executeSql);
-            this.logger.info('executeSqlCfgModel_postgres', pgSql, executeSqlArgs, sqlCfgModel.resPicker);
+            this.logger.debug('[CrudProExecuteSqlService]executeSqlCfgModel_postgres', pgSql, executeSqlArgs, sqlCfgModel.resPicker);
             queryRes = await pgClient.query({
                 text: pgSql,
-                values: executeSqlArgs || []
+                values: executeSqlArgs || [],
             });
-            sqlRes = (0, convertPgType_1.pickAndConvertPgRows)(queryRes);
         }
-        else if (sqlCfgModel.sqlDdType === keys_1.SqlDbType.sqlserver) {
-            const mssql = (0, convertMsSql_1.replaceQuestionMarksForMssql)(sqlCfgModel.executeSql);
-            this.logger.info('executeSqlCfgModel_sqlserver', mssql, executeSqlArgs, sqlCfgModel.resPicker);
+        else if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
             // SQLServer
+            const mssql = (0, convertMsSql_1.replaceQuestionMarksForMssql)(sqlCfgModel.executeSql);
+            this.logger.debug('[CrudProExecuteSqlService]executeSqlCfgModel_sqlserver', mssql, executeSqlArgs, sqlCfgModel.resPicker);
             queryRes = await connection.query(mssql, executeSqlArgs);
-            sqlRes = _.get(queryRes, 'recordsets[0]') || [];
         }
         else {
-            this.logger.info('executeSqlCfgModel_mysql', sqlCfgModel.executeSql, executeSqlArgs, sqlCfgModel.resPicker);
             // MYSQL
+            this.logger.debug('[CrudProExecuteSqlService]executeSqlCfgModel_mysql', sqlCfgModel.executeSql, executeSqlArgs, sqlCfgModel.resPicker);
             queryRes = await connection.query(sqlCfgModel.executeSql, executeSqlArgs);
-            sqlRes = queryRes[0];
         }
+        const sqlRes = (0, convertMix_1.pickAndConvertRowsByMix)(queryRes, sqlCfgModel.sqlDbType);
         const resObject = this.toQueryResByResPicker(sqlRes, queryRes, sqlCfgModel);
         exeCtx.setResModelItem(sqlCfgModel.resName, resObject);
     }
     handleExecuteSqlArgsByResModel(exeCtx, executeSqlArgs) {
-        return executeSqlArgs.map((arg) => {
+        return executeSqlArgs.map(arg => {
             if (arg && typeof arg === 'object' && typeof arg.___GENERATE_GET_RES_ATTR___ === 'string') {
                 const word = arg.___GENERATE_GET_RES_ATTR___;
                 if (word.startsWith(keys_1.KeysOfCustomSQL.SQL_PICK_RES_AS_NUMBER)) {
                     const resName = MixinUtils_1.MixinUtils.removeStringPrefix(word, keys_1.KeysOfCustomSQL.SQL_PICK_RES_AS_NUMBER);
                     this.logger.info('handleExecuteSqlArgsByResModel resName', resName);
-                    this.logger.info('handleExecuteSqlArgsByResModel getResModel', exeCtx.getResModel());
+                    this.logger.debug('handleExecuteSqlArgsByResModel getResModel', exeCtx.getResModel());
                     return Number(exeCtx.getResModelItemLodash(resName) || 0);
                 }
                 if (word.startsWith(keys_1.KeysOfCustomSQL.SQL_PICK_RES_AS_STRING)) {
                     const resName = MixinUtils_1.MixinUtils.removeStringPrefix(word, keys_1.KeysOfCustomSQL.SQL_PICK_RES_AS_STRING);
-                    return String(exeCtx.getResModelItemLodash(resName) || "");
+                    return String(exeCtx.getResModelItemLodash(resName) || '');
                 }
             }
             return arg;
@@ -198,16 +196,16 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
         }
         // 增删改res的内容是修改结果：包括： insert\delete\update
         if (keys_1.KeysOfSqlResPicker.UPDATE_RESULT === resPicker) {
-            if (sqlCfgModel.sqlDdType === keys_1.SqlDbType.postgres) {
+            if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
                 return {
                     insertId: _.get(queryRes, 'rows[0].id'),
-                    affectedRows: _.get(queryRes, 'rowCount')
+                    affectedRows: _.get(queryRes, 'rowCount'),
                 };
             }
-            if (sqlCfgModel.sqlDdType === keys_1.SqlDbType.sqlserver) {
+            if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
                 return {
                     insertId: _.get(queryRes, 'recordset[0].id'),
-                    affectedRows: _.get(queryRes, 'rowsAffected[0]')
+                    affectedRows: _.get(queryRes, 'rowsAffected[0]'),
                 };
             }
             return sqlRes;

package/dist/libs/crud-pro/services/CrudProGenSqlCondition.d.ts

@@ -1,5 +1,5 @@
 import { SqlSegArg } from '../models/SqlSegArg';
-import { SqlCfgModel } from "../models/SqlCfgModel";
+import { SqlCfgModel } from '../models/SqlCfgModel';
 declare class CrudProGenSqlCondition {
     private readonly sqlCfg;
     constructor(sqlCfg: SqlCfgModel);

package/dist/libs/crud-pro/services/CrudProGenSqlCondition.js

@@ -16,10 +16,8 @@ const createFunc = (sqlCfg) => {
         },
         toMatchSqlColumnName: (columnName) => {
             const arr = columnName.split(',');
-            return arr
-                .map(s => (0, convertColumnName_1.toSqlColumnName)(s.trim(), sqlCfg))
-                .join(',');
-        }
+            return arr.map(s => (0, convertColumnName_1.toSqlColumnName)(s.trim(), sqlCfg)).join(',');
+        },
     };
 };
 class ValueChecker {
@@ -192,29 +190,29 @@ class CrudProGenSqlCondition {
                 else if (equalsIgnoreCase(keys_1.KeysOfConditions.$LIKE, compare)) {
                     tmpArgList.push(value0);
                     tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI like concat(?, '%')`; // like前缀匹配
-                    if (this.sqlCfg.sqlDdType === keys_1.SqlDbType.postgres) {
-                        tmpSql = `${toSqlColumnName(key)} like concat(?, '%')`; // like前缀匹配
+                    if (this.sqlCfg.sqlDbType === keys_1.SqlDbType.postgres) {
+                        tmpSql = `${toSqlColumnName(key)} like concat(?::text, '%')`; // like前缀匹配
                     }
                 }
                 else if (equalsIgnoreCase(keys_1.KeysOfConditions.$NOT_LIKE, compare)) {
                     tmpArgList.push(value0);
                     tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI not like concat(?, '%')`;
-                    if (this.sqlCfg.sqlDdType === keys_1.SqlDbType.postgres) {
-                        tmpSql = `${toSqlColumnName(key)} not like concat(?, '%')`;
+                    if (this.sqlCfg.sqlDbType === keys_1.SqlDbType.postgres) {
+                        tmpSql = `${toSqlColumnName(key)} not like concat(?::text, '%')`;
                     }
                 }
                 else if (equalsIgnoreCase(keys_1.KeysOfConditions.$LIKE_INCLUDE, compare)) {
                     tmpArgList.push(value0);
                     tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI like concat('%', ?, '%')`; // like包含
-                    if (this.sqlCfg.sqlDdType === keys_1.SqlDbType.postgres) {
-                        tmpSql = `${toSqlColumnName(key)} like concat('%', ?, '%')`; // like包含
+                    if (this.sqlCfg.sqlDbType === keys_1.SqlDbType.postgres) {
+                        tmpSql = `${toSqlColumnName(key)} like concat('%', ?::text, '%')`; // like包含
                     }
                 }
                 else if (equalsIgnoreCase(keys_1.KeysOfConditions.$NOT_LIKE_INCLUDE, compare)) {
                     tmpArgList.push(value0);
                     tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI not like concat('%',?, '%')`; // like不包含
-                    if (this.sqlCfg.sqlDdType === keys_1.SqlDbType.postgres) {
-                        tmpSql = `${toSqlColumnName(key)} not like concat('%',?, '%')`; // like不包含
+                    if (this.sqlCfg.sqlDbType === keys_1.SqlDbType.postgres) {
+                        tmpSql = `${toSqlColumnName(key)} not like concat('%',?::text, '%')`; // like不包含
                     }
                 }
                 else if (equalsIgnoreCase(keys_1.KeysOfConditions.$MATCH, compare)) {

package/dist/libs/crud-pro/services/CrudProGenSqlService.js

@@ -91,10 +91,10 @@ class CrudProGenSqlService extends CrudProServiceBase_1.CrudProServiceBase {
      * @private
      */
     generateOriginSqlForDelete(cfgModel) {
-        if (cfgModel.sqlDdType === keys_1.SqlDbType.postgres) {
+        if (cfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
             return 'delete from @@table where @@asWhere:condition ';
         }
-        if (cfgModel.sqlDdType === keys_1.SqlDbType.sqlserver) {
+        if (cfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
             return 'delete from @@table where @@asWhere:condition ';
         }
         return 'delete from @@table where @@asWhere:condition limit 100 '; // 删除操作，不能一次性删除太多
@@ -105,35 +105,26 @@ class CrudProGenSqlService extends CrudProServiceBase_1.CrudProServiceBase {
      * @private
      */
     generateOriginSqlForDuplicateInsert(cfgModel) {
-        if (cfgModel.sqlDdType === keys_1.SqlDbType.postgres) {
+        if (cfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
             const uniqueColumn = cfgModel.uniqueColumn; // id
             if (!Array.isArray(uniqueColumn) || uniqueColumn.length === 0) {
                 throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_ERROR_POSTGRES_UNIQUE_COLUMNS_NULL);
             }
-            const unique_column = uniqueColumn.map((s) => {
+            const unique_column = uniqueColumn
+                .map(s => {
                 return `"${s}"`;
-            }).join(",");
+            })
+                .join(',');
             return `insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data ) ON CONFLICT (${unique_column}) DO UPDATE set @@asUpdate:data `; // 关键字的前后，必须有空格
         }
-        if (cfgModel.sqlDdType === keys_1.SqlDbType.sqlserver) {
+        if (cfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
             const uniqueColumn = cfgModel.uniqueColumn; // id
             if (uniqueColumn.length !== 1) {
                 throw new exceptions_1.CommonException(exceptions_1.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";
+            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 '; // 关键字的前后，必须有空格
@@ -144,10 +135,10 @@ class CrudProGenSqlService extends CrudProServiceBase_1.CrudProServiceBase {
      * @private
      */
     generateOriginSqlForInsert(cfgModel) {
-        if (cfgModel.sqlDdType === keys_1.SqlDbType.postgres) {
+        if (cfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
             return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data ) RETURNING * ';
         }
-        if (cfgModel.sqlDdType === keys_1.SqlDbType.sqlserver) {
+        if (cfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
             return 'insert into @@table ( @@asInsertKeys:data ) OUTPUT INSERTED.* values( @@asInsertValues:data ) ';
         }
         return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data )'; // 关键字的前后，必须有空格
@@ -156,10 +147,10 @@ class CrudProGenSqlService extends CrudProServiceBase_1.CrudProServiceBase {
         const exeCtx = this.getExecuteContext();
         const reqCfgModel = exeCtx.getCfgModel();
         const sqlCfgList = reqCfgModel.sqlCfgList || [];
-        const { sqlTable, sqlSchema, sqlDatabase, sqlDdType, maxLimit, columns, columnsRelation } = reqCfgModel;
+        const { sqlTable, sqlSchema, sqlDatabase, sqlDbType, maxLimit, columns, columnsRelation } = reqCfgModel;
         for (let i = 0; i < sqlCfgList.length; i++) {
             const sqlCfgModel = sqlCfgList[i];
-            sqlCfgModel.sqlDdType = MixinUtils_1.MixinUtils.selectNotEmpty(sqlCfgModel.sqlDdType, sqlDdType);
+            sqlCfgModel.sqlDbType = MixinUtils_1.MixinUtils.selectNotEmpty(sqlCfgModel.sqlDbType, sqlDbType);
             sqlCfgModel.sqlDatabase = MixinUtils_1.MixinUtils.selectNotEmpty(sqlCfgModel.sqlDatabase, sqlDatabase);
             sqlCfgModel.sqlSchema = MixinUtils_1.MixinUtils.selectNotEmpty(sqlCfgModel.sqlSchema, sqlSchema);
             sqlCfgModel.sqlTable = MixinUtils_1.MixinUtils.selectNotEmpty(sqlCfgModel.sqlTable, sqlTable);

package/dist/libs/crud-pro/services/CrudProOriginToExecuteSql.js

@@ -100,8 +100,7 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase_1.CrudProServiceBase
         else if (word === keys_1.KeysOfCustomSQL.SQL_ORDER_BYS) {
             return this.generateOrderBys(reqModel, sqlCfg);
         }
-        else if ((word.startsWith(keys_1.KeysOfCustomSQL.SQL_GET_DATA_ATTR_START) ||
-            word.startsWith(keys_1.KeysOfCustomSQL.SQL_GET_CONDITION_ATTR_START)) && word.indexOf('.') > 0) {
+        else if ((word.startsWith(keys_1.KeysOfCustomSQL.SQL_GET_DATA_ATTR_START) || word.startsWith(keys_1.KeysOfCustomSQL.SQL_GET_CONDITION_ATTR_START)) && word.indexOf('.') > 0) {
             return this.generateGetAttr(reqModel, word); //// data.xxx, condition.xxx
         }
         else if (word.startsWith(keys_1.KeysOfCustomSQL.SQL_PICK_RES_AS_NUMBER) || word.startsWith(keys_1.KeysOfCustomSQL.SQL_PICK_RES_AS_STRING)) {
@@ -198,10 +197,10 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase_1.CrudProServiceBase
         const maxLimit = ModelUtils_1.ModelUtils.getMaxLimit(sqlCfg, requestCfg);
         const reqLimit = req.limit;
         const limit = Math.min(maxLimit, reqLimit);
-        if (sqlCfg.sqlDdType === keys_1.SqlDbType.postgres) {
+        if (sqlCfg.sqlDbType === keys_1.SqlDbType.postgres) {
             return new SqlSegArg_1.SqlSegArg(' LIMIT ? OFFSET ? ', [limit, req.offset]);
         }
-        if (sqlCfg.sqlDdType === keys_1.SqlDbType.sqlserver) {
+        if (sqlCfg.sqlDbType === keys_1.SqlDbType.sqlserver) {
             return new SqlSegArg_1.SqlSegArg(' OFFSET ? ROWS FETCH NEXT ? ROWS ONLY ', [req.offset, limit]);
         }
         return new SqlSegArg_1.SqlSegArg(' limit ?,? ', [req.offset, limit]);
@@ -219,9 +218,11 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase_1.CrudProServiceBase
         return new SqlSegArg_1.SqlSegArg(sql);
     }
     generatePickResAs(req, world) {
-        return new SqlSegArg_1.SqlSegArg(' ? ', [{
+        return new SqlSegArg_1.SqlSegArg(' ? ', [
+            {
                 ___GENERATE_GET_RES_ATTR___: world,
-            }]);
+            },
+        ]);
     }
     generateGetAttr(req, word) {
         const attrName = MixinUtils_1.MixinUtils.removeStringPrefix(word, '@@');

package/dist/libs/crud-pro/services/CrudProServiceBase.d.ts

@@ -1,12 +1,8 @@
 import { ICurdProServiceHub } from '../models/ServiceHub';
-import { ICrudProCfg, ILogger, IPoolConnectionClient } from '../interfaces';
+import { ICrudProCfg, IExecuteUnsafeQueryCtx, ILogger, IPoolConnectionClient } from '../interfaces';
 import { SqlCfgModel } from '../models/SqlCfgModel';
 import { ExecuteContext } from '../models/ExecuteContext';
 import { IExecuteContextFunc } from '../models/ExecuteContextFunc';
-interface ExecuteUnsafeQueryCtx {
-    tableName: string;
-    dbName: string;
-}
 declare class CrudProServiceBase {
     protected serviceHub: ICurdProServiceHub;
     constructor(serviceHub: ICurdProServiceHub);
@@ -21,7 +17,7 @@ declare class CrudProServiceBase {
      * @param values
      * @protected
      */
-    protected executeUnsafeQuery(obj: ExecuteUnsafeQueryCtx, sql: string, values?: any): Promise<any[]>;
+    protected executeUnsafeQuery(obj: IExecuteUnsafeQueryCtx, sql: string, values?: any): Promise<any[]>;
     protected getContextCfg(): ICrudProCfg;
     protected getExecuteFunction(funcName: string): any;
 }

package/dist/libs/crud-pro/services/CrudProServiceBase.js

@@ -7,6 +7,9 @@ const TypeUtils_1 = require("../utils/TypeUtils");
 const CompareUtils_1 = require("../utils/CompareUtils");
 const DateTimeUtils_1 = require("../utils/DateTimeUtils");
 const defaultConfigs_1 = require("../defaultConfigs");
+const keys_1 = require("../models/keys");
+const convertPgSql_1 = require("../utils/sqlConvert/convertPgSql");
+const convertMsSql_1 = require("../utils/sqlConvert/convertMsSql");
 function createBuildInExecuteFuncMap() {
     return {
         ...DateTimeUtils_1.DateTimeUtils,
@@ -45,8 +48,9 @@ class CrudProServiceBase {
      */
     async executeUnsafeQuery(obj, sql, values) {
         const sqlCfgModel = {
-            sqlTable: obj.tableName,
-            sqlDatabase: obj.dbName,
+            sqlTable: obj.sqlTable,
+            sqlDatabase: obj.sqlDatabase,
+            sqlDbType: obj.sqlDbType,
             columns: [],
             columnsRelation: [],
             maxLimit: defaultConfigs_1.DEFAULT_MAX_LIMIT,
@@ -56,8 +60,16 @@ class CrudProServiceBase {
             executeSqlArgs: values,
             crudType: null,
         };
+        if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
+            const pgSql = (0, convertPgSql_1.replaceQuestionMarks)(sqlCfgModel.executeSql);
+            sqlCfgModel.executeSql = pgSql;
+        }
+        else if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
+            const mssql = (0, convertMsSql_1.replaceQuestionMarksForMssql)(sqlCfgModel.executeSql);
+            sqlCfgModel.executeSql = mssql;
+        }
         const connection = await this.getTxConnectionBySqlCfg(sqlCfgModel);
-        return await connection.query(sql, values);
+        return await connection.query(sqlCfgModel.executeSql, values);
     }
     getContextCfg() {
         return this.getExecuteContext().getContextCfg();

package/dist/libs/crud-pro/services/CrudProTableMetaService.d.ts

@@ -4,5 +4,6 @@ import { ITableMeta } from '../interfaces';
 declare class CrudProTableMetaService extends CrudProServiceBase {
     getTableMeta(sqlCfgModel: SqlCfgModel): Promise<ITableMeta>;
     private loadTableMeta;
+    private loadTableColumnInfo;
 }
 export { CrudProTableMetaService };

package/dist/libs/crud-pro/services/CrudProTableMetaService.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrudProTableMetaService = void 0;
 const CrudProServiceBase_1 = require("./CrudProServiceBase");
+const keys_1 = require("../models/keys");
+const convertMix_1 = require("../utils/sqlConvert/convertMix");
 class CrudProTableMetaCache {
     constructor() {
         this.cacheMap = {};
@@ -39,15 +41,38 @@ class CrudProTableMetaService extends CrudProServiceBase_1.CrudProServiceBase {
             tableColumns: [],
         };
         const baseInfo = {
-            tableName: sqlCfgModel.sqlTable,
-            dbName: sqlCfgModel.sqlDatabase,
+            sqlTable: sqlCfgModel.sqlTable,
+            sqlDatabase: sqlCfgModel.sqlDatabase,
+            sqlDbType: sqlCfgModel.sqlDbType,
         };
-        const [tableDescribe] = await this.executeUnsafeQuery(baseInfo, 'describe ' + sqlCfgModel.sqlTable);
-        const tableDescribe2 = JSON.parse(JSON.stringify(tableDescribe));
-        obj.tableColumns = tableDescribe2.map(fieldObj => {
-            return fieldObj['Field'];
-        });
+        obj.tableColumns = await this.loadTableColumnInfo(baseInfo);
         return obj;
     }
+    async loadTableColumnInfo(baseInfo) {
+        if (baseInfo.sqlDbType === keys_1.SqlDbType.mysql) {
+            const queryRes = await this.executeUnsafeQuery(baseInfo, 'describe ' + baseInfo.sqlTable);
+            const tableDescribe = (0, convertMix_1.pickAndConvertRowsByMix)(queryRes, baseInfo.sqlDbType);
+            const tableDescribe2 = JSON.parse(JSON.stringify(tableDescribe));
+            return tableDescribe2.map(fieldObj => {
+                return fieldObj['Field'];
+            });
+        }
+        else if (baseInfo.sqlDbType === keys_1.SqlDbType.postgres) {
+            const schemaname = 'public';
+            const columnArraySql = `
+      SELECT
+        *
+        FROM information_schema.columns
+        WHERE table_schema = '${schemaname}' and table_name = '${baseInfo.sqlTable}'
+        ORDER BY ordinal_position;
+      `.trim();
+            const queryRes = await this.executeUnsafeQuery(baseInfo, columnArraySql);
+            const tableDescribe = (0, convertMix_1.pickAndConvertRowsByMix)(queryRes, baseInfo.sqlDbType);
+            return tableDescribe.map(fieldObj => {
+                return fieldObj['column_name'];
+            });
+        }
+        throw new Error('暂不支持的数据库类型：' + baseInfo.sqlDbType);
+    }
 }
 exports.CrudProTableMetaService = CrudProTableMetaService;