mm_mysql 2.3.9 → 2.4.1

package/index.js

@@ -207,11 +207,13 @@ Mysql.prototype.run = async function (sql, params = []) {
   }
 
   this.error = null;
+  this.sql = '';
   let conn = null;
   let ret = [];
   try {
     // 获取连接
     conn = await this.getConn();
+    this.sql = sql;
     let [rows] = await conn.query(sql, params);
     ret = rows;
   } catch (err) {
@@ -243,11 +245,13 @@ Mysql.prototype.exec = async function (sql, params = []) {
     throw new TypeError('params must be array');
   }
   this.error = null;
+  this.sql = '';
   let conn = null;
   let ret = 0;
   try {
     // 获取连接
     conn = await this.getConn();
+    this.sql = sql;
     let [result] = await conn.execute(sql, params);
     ret = result.insertId || result.affectedRows || result.changedRows || 1;
   } catch (error) {
@@ -413,7 +417,7 @@ Mysql.prototype.getPoolStats = function () {
  */
 Mysql.prototype.healthCheck = async function () {
   try {
-    if (!this._pool && !this._connection) {
+    if (!this._pool && !this._conneced) {
       return {
         status: 'error',
         message: '数据库连接未初始化'
@@ -475,34 +479,6 @@ if (!$.pool.mysql) {
   $.pool.mysql = {};
 }
 
-/**
- * 全局锁对象，用于线程安全
- */
-if (!$.pool.mysql._locks) {
-  $.pool.mysql._locks = {};
-}
-
-/**
- * 获取锁
- * @param {string} key - 锁的键名
- * @returns {Promise<Function>} 释放锁的函数
- */
-function _acquireLock(key) {
-  if (!$.pool.mysql._locks[key]) {
-    $.pool.mysql._locks[key] = Promise.resolve();
-  }
-
-  let release;
-  let lockPromise = $.pool.mysql._locks[key].then(() => {
-    return new Promise(resolve => {
-      release = resolve;
-    });
-  });
-
-  $.pool.mysql._locks[key] = lockPromise;
-  return lockPromise.then(() => release);
-}
-
 /**
  * @description Mysql管理器，用于创建缓存（线程安全版）
  * @param {string} scope 作用域

package/package.json

@@ -1,11 +1,11 @@
 {
 	"name": "mm_mysql",
-	"version": "2.3.9",
+	"version": "2.4.1",
 	"description": "这是超级美眉mysql帮助函数模块，用于便捷操作mysql，使用await方式，可以避免嵌套函数",
 	"main": "index.js",
 	"dependencies": {
-		"mm_expand": "^2.2.8",
-		"mysql2": "^3.22.0",
+		"mm_expand": "^2.2.9",
+		"mysql2": "^3.22.3",
 		"sqlstring": "^2.3.3"
 	},
 	"scripts": {
@@ -36,7 +36,7 @@
 		"node": ">=12.0.0"
 	},
 	"devDependencies": {
-		"eslint": "^10.2.0",
+		"eslint": "^10.2.1",
 		"eslint-plugin-jsdoc": "^62.9.0",
 		"mm_eslint": "^1.7.1"
 	}