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

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

@@ -1,16 +1,15 @@
 import * as _ from 'lodash';
-import { PoolClient } from 'pg';
 import { CrudProServiceBase } from './CrudProServiceBase';
 import { SqlCfgModel } from '../models/SqlCfgModel';
 import { KeyOfCrudTypes, KeysOfCustomSQL, KeysOfSqlResPicker, SqlDbType } from '../models/keys';
 import { CommonException, Exceptions } from '../exceptions';
-import { pickAndConvertRowsByMix } from '../utils/sqlConvert/convertMix';
 import { replaceQuestionMarks } from '../utils/sqlConvert/convertPgSql';
 import { replaceQuestionMarksForMssql } from '../utils/sqlConvert/convertMsSql';
 import { ModelUtils } from '../utils/ModelUtils';
 import { MixinUtils } from '../utils/MixinUtils';
 import { FuncContext } from '../models/FuncContext';
 import { ExecuteContext } from '../models/ExecuteContext';
+import { IPoolConnectionClient, IPoolConnectionQueryResult } from "@/libs/crud-pro/interfaces";
 
 const { checkFuncCfgValid } = ModelUtils;
 const { isEmpty } = MixinUtils;
@@ -32,20 +31,15 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
     this.logger.info('[CrudProExecuteSqlService] executeSqlCfgModel_before', sqlCfgModel.executeSql, sqlCfgModel.executeSqlArgs);
 
     const exeCtx = this.getExecuteContext();
-    const connection = await this.getTxConnectionBySqlCfg(sqlCfgModel);
+    const connection: IPoolConnectionClient = await this.getTxConnectionBySqlCfg(sqlCfgModel);
     const executeSqlArgs = this.handleExecuteSqlArgsByResModel(exeCtx, sqlCfgModel.executeSqlArgs || []);
 
-    let queryRes: any;
+    let queryRes: IPoolConnectionQueryResult;
 
     if (sqlCfgModel.sqlDbType === SqlDbType.postgres) {
-      // import { PoolClient } from 'pg';
 
-      const pgClient: PoolClient = connection as any;
       const pgSql = replaceQuestionMarks(sqlCfgModel.executeSql, sqlCfgModel.isNativeSQL);
-      queryRes = await pgClient.query({
-        text: pgSql,
-        values: executeSqlArgs || [],
-      });
+      queryRes = await connection.query(pgSql, executeSqlArgs);
 
       this.logger.debug('[CrudProExecuteSqlService] executeSqlCfgModel_postgres', pgSql, executeSqlArgs, sqlCfgModel.resPicker);
 
@@ -62,8 +56,7 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
       this.logger.debug('[CrudProExecuteSqlService] executeSqlCfgModel_mysql', sqlCfgModel.executeSql, executeSqlArgs, sqlCfgModel.resPicker);
     }
 
-    const sqlRes = pickAndConvertRowsByMix(queryRes, sqlCfgModel.sqlDbType);
-    const resObject = this.toQueryResByResPicker(sqlRes, queryRes, sqlCfgModel);
+    const resObject = this.toQueryResByResPicker(queryRes.rows, queryRes.originRes, sqlCfgModel);
     exeCtx.setResModelItem(sqlCfgModel.resName, resObject);
   }
 
@@ -207,12 +200,11 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
     return result === true;
   }
 
-  private toQueryResByResPicker(sqlRes: any, queryRes: any, sqlCfgModel: SqlCfgModel) {
+  private toQueryResByResPicker(rows: any[], originRes: any, sqlCfgModel: SqlCfgModel) {
     const resPicker = sqlCfgModel.resPicker;
 
     // 返回第一行
     if (KeysOfSqlResPicker.RESULT_FIRST_ROW === resPicker) {
-      const rows = sqlRes as any[];
       if (rows && rows.length > 0) {
         return rows[0];
       }
@@ -221,7 +213,6 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
 
     // $ResultSet[0].total_count ， 只取第一行的的total_count
     if (KeysOfSqlResPicker.RESULT_TOTAL_COUNT === resPicker) {
-      const rows = sqlRes as any[];
       if (isEmpty(rows)) {
         return 0;
       }
@@ -233,31 +224,31 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
     if (KeysOfSqlResPicker.UPDATE_RESULT === resPicker) {
       if (sqlCfgModel.sqlDbType === SqlDbType.postgres) {
         return {
-          insertId: _.get(queryRes, 'rows[0].id'),
-          affectedRows: _.get(queryRes, 'rowCount'),
+          insertId: _.get(originRes, 'rows[0].id'),
+          affectedRows: _.get(originRes, 'rowCount'),
         };
       }
 
       if (sqlCfgModel.sqlDbType === SqlDbType.sqlserver) {
         return {
-          insertId: _.get(queryRes, 'recordset[0].id'),
-          affectedRows: _.get(queryRes, 'rowsAffected[0]'),
+          insertId: _.get(originRes, 'recordset[0].id'),
+          affectedRows: _.get(originRes, 'rowsAffected[0]'),
         };
       }
 
-      return sqlRes;
+      return rows;
     }
 
     //其他配置：形如： sqlRes[0].total_count
     if (typeof resPicker === 'string') {
       if (resPicker.startsWith('sqlRes')) {
-        return _.get({ sqlRes }, resPicker);
+        return _.get({ sqlRes: rows }, resPicker);
       } else {
         throw new CommonException(Exceptions.RUN_EXECUTE_VALIDATE, 'resPicker必须是以sqlRes开头');
       }
     }
 
-    return sqlRes;
+    return rows;
   }
 }
 

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

@@ -2,7 +2,7 @@ import { CrudProServiceBase } from './CrudProServiceBase';
 import { SqlCfgModel } from '../models/SqlCfgModel';
 import { IExecuteUnsafeQueryCtx, ITableMeta } from '../interfaces';
 import { SqlDbType } from '../models/keys';
-import { pickAndConvertRowsByMix } from '../utils/sqlConvert/convertMix';
+// import { pickAndConvertRowsByMix } from '../utils/sqlConvert/convertMix';
 
 class CrudProTableMetaCache {
   private cacheMap: Record<string, ITableMeta> = {};
@@ -58,7 +58,7 @@ class CrudProTableMetaService extends CrudProServiceBase {
   private async loadTableColumnInfo(baseInfo: IExecuteUnsafeQueryCtx): Promise<string[]> {
     if (baseInfo.sqlDbType === SqlDbType.mysql) {
       const queryRes = await this.executeUnsafeQuery(baseInfo, 'describe ' + baseInfo.sqlTable);
-      const tableDescribe = pickAndConvertRowsByMix(queryRes, baseInfo.sqlDbType);
+      const tableDescribe = queryRes.rows || []; //pickAndConvertRowsByMix(queryRes, baseInfo.sqlDbType);
       const tableDescribe2 = JSON.parse(JSON.stringify(tableDescribe));
       return tableDescribe2.map(fieldObj => {
         return fieldObj['Field'];
@@ -73,7 +73,7 @@ class CrudProTableMetaService extends CrudProServiceBase {
         ORDER BY ordinal_position;
       `.trim();
       const queryRes = await this.executeUnsafeQuery(baseInfo, columnArraySql);
-      const tableDescribe = pickAndConvertRowsByMix(queryRes, baseInfo.sqlDbType);
+      const tableDescribe = queryRes.rows || [];
       return tableDescribe.map(fieldObj => {
         return fieldObj['column_name'];
       });

package/src/libs/crud-pro/utils/CrudMonitor.ts

@@ -1,13 +1,13 @@
-
-const CrudMonitor = {
-  mysqlGetConnectionCount: 0,
-  mysqlReleaseConnectionCount: 0,
-  postgresGetConnectionCount: 0,
-  postgresReleaseConnectionCount: 0,
-  mssqlGetConnectionCount: 0,
-  mssqlReleaseConnectionCount: 0,
-}
-
-export  {
-  CrudMonitor,
-}
+
+const CrudMonitor = {
+  mysqlGetConnectionCount: 0,
+  mysqlReleaseConnectionCount: 0,
+  postgresGetConnectionCount: 0,
+  postgresReleaseConnectionCount: 0,
+  mssqlGetConnectionCount: 0,
+  mssqlReleaseConnectionCount: 0,
+}
+
+export  {
+  CrudMonitor,
+}

package/src/libs/crud-pro/utils/MixinUtils.ts

@@ -280,6 +280,9 @@ const MixinUtils = {
     }
     return value;
   },
+  sleepMs(ms: number): Promise<any> {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  }
 };
 
 export { MixinUtils };

package/src/libs/crud-pro/utils/sqlConvert/convertMix.ts

@@ -1,24 +1,24 @@
-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 };
+// 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 };