mm_mysql 2.2.2 → 2.2.4

package/db.js

@@ -14,8 +14,8 @@ class DB extends Sql {
 	constructor(mysql) {
 		// 正确绑定run和exec方法的上下文
 		super(
-			mysql.run ? mysql.run.bind(mysql) : null,
-			mysql.exec ? mysql.exec.bind(mysql) : null
+			mysql.run,
+			mysql.exec
 		);
 		// 保存mysql实例引用
 		this._mysql = mysql;
@@ -76,56 +76,6 @@ DB.prototype.new = function (table, key) {
 	return db;
 };
 
-/**
- * 执行SQL查询
- * @param {String} sql - SQL语句
- * @param {Array} params - 参数数组
- * @returns {Promise<Array>}
- * @throws {TypeError} 当sql参数无效时
- */
-DB.prototype.run = async function(sql, params = []) {
-    // 参数校验
-    if (typeof sql !== 'string' || sql.trim() === '') {
-        throw new TypeError('sql must be non-empty string');
-    }
-    if (!Array.isArray(params)) {
-        throw new TypeError('params must be array');
-    }
-    
-    try {
-        return await this._mysql.run(sql, params);
-    } catch (error) {
-        this.logger('error', 'SQL执行失败', error);
-        // 返回空数组作为默认值，保持返回值类型一致
-        return [];
-    }
-};
-
-/**
- * 执行SQL语句
- * @param {String} sql - SQL语句
- * @param {Array} params - 参数数组
- * @returns {Promise<Object>}
- * @throws {TypeError} 当sql参数无效时
- */
-DB.prototype.exec = async function(sql, params = []) {
-    // 参数校验
-    if (typeof sql !== 'string' || sql.trim() === '') {
-        throw new TypeError('sql must be non-empty string');
-    }
-    if (!Array.isArray(params)) {
-        throw new TypeError('params must be array');
-    }
-    
-    try {
-        return await this._mysql.exec(sql, params);
-    } catch (error) {
-        this.logger('error', 'SQL执行失败', error);
-        // 返回空数组作为默认值，保持返回值类型一致
-        return 0;
-    }
-};
-
 /**
  * 获取数据库连接
  * @returns {Promise<Object>}

package/index.js

@@ -40,13 +40,6 @@ class Mysql extends Base {
         this._pool = null;
         this._connection = null;
         this._usePool = this.config.connection_limit > 1;
-        this._pool_stats = {
-            total_connections: 0,
-            active_connections: 0,
-            idle_connections: 0,
-            connection_errors: 0,
-            last_health_check: null
-        };
     }
 }
 
@@ -168,21 +161,15 @@ Mysql.prototype.close = async function () {
  * @param {boolean} is_pool_conn - 是否为连接池连接
  * @returns {Promise<void>}
  */
-Mysql.prototype._safeReleaseConnection = async function (conn, is_pool_conn) {
+async function safeReleaseConnection(conn, is_pool_conn) {
     if (!conn) return;
 
     try {
         if (is_pool_conn && typeof conn.release === 'function') {
             await conn.release();
-            // 更新统计信息
-            if (this._pool_stats.active_connections > 0) {
-                this._pool_stats.active_connections--;
-            }
-            this._pool_stats.idle_connections++;
         }
     } catch (release_err) {
-        this.logger('error', '释放连接失败', release_err);
-        this._pool_stats.connection_errors++;
+       $.log.error('释放连接失败', release_err);
     }
 };
 
@@ -194,25 +181,18 @@ Mysql.prototype._safeReleaseConnection = async function (conn, is_pool_conn) {
 Mysql.prototype.getConn = async function () {
     // 参数校验
     if (!this._pool && !this._connection) {
-        throw new Error('数据库连接未初始化');
+        await this.open();
     }
 
     try {
         if (this._usePool) {
             const conn = await this._pool.getConnection();
-            // 更新统计信息
-            this._pool_stats.total_connections++;
-            this._pool_stats.active_connections++;
-            if (this._pool_stats.idle_connections > 0) {
-                this._pool_stats.idle_connections--;
-            }
             return conn;
         } else {
             return this._connection;
         }
     } catch (error) {
         this.logger('error', '获取连接失败', error);
-        this._pool_stats.connection_errors++;
     }
     return null;
 };
@@ -247,7 +227,6 @@ Mysql.prototype.run = async function (sql, params = []) {
         const [rows] = await conn.query(sql, params);
         return rows;
     } catch (err) {
-        this.logger('error', 'SQL执行失败', err);
         this.sql = err.sql;
         this.error = {
             code: err.errno,
@@ -255,7 +234,7 @@ Mysql.prototype.run = async function (sql, params = []) {
         };
         // 在错误情况下也要确保连接释放
         try {
-            await this._safeReleaseConnection(conn, is_pool_conn);
+            await safeReleaseConnection(conn, is_pool_conn);
         } catch (release_err) {
             this.logger('error', '释放连接失败', release_err);
         }
@@ -264,7 +243,7 @@ Mysql.prototype.run = async function (sql, params = []) {
         // 确保连接被释放，避免资源泄漏
         if (!connection_released) {
             try {
-                await this._safeReleaseConnection(conn, is_pool_conn);
+                await safeReleaseConnection(conn, is_pool_conn);
             } catch (release_err) {
                 this.logger('error', '释放连接失败', release_err);
             }
@@ -310,7 +289,7 @@ Mysql.prototype.exec = async function (sql, params = []) {
         };
         // 在错误情况下也要确保连接释放
         try {
-            await this._safeReleaseConnection(conn, is_pool_conn);
+            await safeReleaseConnection(conn, is_pool_conn);
         } catch (release_err) {
             this.logger('error', '释放连接失败', release_err);
         }
@@ -319,7 +298,7 @@ Mysql.prototype.exec = async function (sql, params = []) {
         // 确保连接被释放，避免资源泄漏
         if (!connection_released) {
             try {
-                await this._safeReleaseConnection(conn, is_pool_conn);
+                await safeReleaseConnection(conn, is_pool_conn);
             } catch (release_err) {
                 this.logger('error', '释放连接失败', release_err);
             }
@@ -351,7 +330,7 @@ Mysql.prototype.beginTransaction = async function () {
                 await conn.commit();
                 transaction_committed = true;
                 try {
-                    await this._safeReleaseConnection(conn, this._usePool);
+                    await safeReleaseConnection(conn, this._usePool);
                 } catch (release_err) {
                     this.logger('error', '提交时释放连接失败', release_err);
                 }
@@ -364,7 +343,7 @@ Mysql.prototype.beginTransaction = async function () {
                 await conn.rollback();
                 transaction_rolled_back = true;
                 try {
-                    await this._safeReleaseConnection(conn, this._usePool);
+                    await safeReleaseConnection(conn, this._usePool);
                 } catch (release_err) {
                     this.logger('error', '回滚时释放连接失败', release_err);
                 }
@@ -374,7 +353,7 @@ Mysql.prototype.beginTransaction = async function () {
     } catch (error) {
         // 如果事务开始失败，确保连接被释放
         try {
-            await this._safeReleaseConnection(conn, this._usePool);
+            await safeReleaseConnection(conn, this._usePool);
         } catch (release_err) {
             this.logger('error', '释放连接失败', release_err);
         }
@@ -492,13 +471,8 @@ Mysql.prototype.getPoolStats = function () {
         };
     }
 
-    // 更新统计信息
-    this._pool_stats.last_health_check = new Date();
-
     return {
-        status: 'healthy',
-        ...this._pool_stats,
-        last_health_check: this._pool_stats.last_health_check
+        status: 'healthy'
     };
 };
 
@@ -586,14 +560,14 @@ function _acquireLock(key) {
     if (!$.pool.mysql._locks[key]) {
         $.pool.mysql._locks[key] = Promise.resolve();
     }
-    
+
     let release;
     const lockPromise = $.pool.mysql._locks[key].then(() => {
         return new Promise(resolve => {
             release = resolve;
         });
     });
-    
+
     $.pool.mysql._locks[key] = lockPromise;
     return lockPromise.then(() => release);
 }
@@ -608,17 +582,17 @@ function mysqlAdmin(scope, config) {
     if (!scope) {
         scope = 'sys';
     }
-    
+
     // 检查是否已存在实例
     if ($.pool.mysql[scope]) {
         return $.pool.mysql[scope];
     }
-    
+
     // 同步方式创建实例（无需锁，因为Node.js是单线程的）
     if (!$.pool.mysql[scope]) {
         $.pool.mysql[scope] = new Mysql(config);
     }
-    
+
     return $.pool.mysql[scope];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mm_mysql",
-	"version": "2.2.2",
+	"version": "2.2.4",
 	"description": "这是超级美眉mysql帮助函数模块，用于便捷操作mysql，使用await方式，可以避免嵌套函数",
 	"main": "index.js",
 	"dependencies": {

package/test.js

@@ -381,7 +381,6 @@ TestMysql.prototype.testDbClass = async function() {
         
         // 测试DB类的get方法
         const get_result = await db.get({ name: test_user_name });
-        
         if (get_result.length < 1) {
             throw new Error('DB.get()方法测试失败');
         }