mm_mysql 2.5.2 → 2.5.4

package/index.js

@@ -245,6 +245,59 @@ Mysql.prototype.exec = async function (sql, params = []) {
   return ret;
 };
 
+/**
+ * 执行多语句SQL脚本（专用于导入）
+ * 通过独立连接执行，不影响连接池默认配置
+ * @param {string} sql - SQL脚本内容，可含多条以分号分隔的语句
+ * @returns {Promise<object>} 执行结果统计对象
+ * @throws {TypeError} 当sql参数无效时
+ */
+Mysql.prototype.runSql = async function (sql) {
+  // 参数校验
+  if (typeof sql !== 'string' || sql.trim() === '') {
+    throw new TypeError('sql must be non-empty string');
+  }
+
+  let conn = null;
+  let ret = { success: false, statements: 0, affected_rows: 0, error: null };
+  try {
+    // 创建专用连接，仅导入连接开启多语句支持
+    let valid_config = this._getValidConfig(false);
+    valid_config.multipleStatements = true;
+    conn = await mysql.createConnection(valid_config);
+
+    // 执行整段SQL脚本
+    let [results] = await conn.query(sql);
+    // 统计语句数和受影响行数
+    if (Array.isArray(results)) {
+      ret.statements = results.length;
+      for (let item of results) {
+        ret.affected_rows += item.affectedRows || 0;
+      }
+    } else {
+      ret.statements = 1;
+      ret.affected_rows = results.affectedRows || 0;
+    }
+    ret.success = true;
+  } catch (error) {
+    this.error = {
+      code: error.errno,
+      message: error.sqlMessage || error.message
+    };
+    this.sql = error.sql || sql;
+    ret.error = this.error.message;
+  } finally {
+    if (conn) {
+      try {
+        await conn.end();
+      } catch (end_error) {
+        this.log('error', '关闭导入连接失败', end_error);
+      }
+    }
+  }
+  return ret;
+};
+
 /**
  * 开始事务（优化版）
  * @returns {Promise<object>} 事务连接对象

package/package.json

@@ -1,11 +1,11 @@
 {
 	"name": "mm_mysql",
-	"version": "2.5.2",
+	"version": "2.5.4",
 	"description": "这是超级美眉mysql帮助函数模块，用于便捷操作mysql，使用await方式，可以避免嵌套函数",
 	"main": "index.js",
 	"dependencies": {
-		"mm_expand": "^2.5.1",
-		"mysql2": "^3.23.2",
+		"mm_expand": "^2.5.3",
+		"mysql2": "^3.23.3",
 		"sqlstring": "^2.3.3"
 	},
 	"scripts": {
@@ -37,7 +37,7 @@
 	},
 	"devDependencies": {
 		"eslint": "^10.8.1",
-		"eslint-plugin-jsdoc": "^64.0.1",
-		"mm_eslint": "^1.7.5"
+		"eslint-plugin-jsdoc": "^64.2.0",
+		"mm_eslint": "^1.7.6"
 	}
 }

package/sql.js

@@ -775,6 +775,26 @@ Sql.prototype.getObj = async function (query, sort, view, like, timeout = 20000)
   return obj;
 };
 
+/**
+ * 查询数据
+ * @param {object} query 查询条件
+ * @param {string} sort 排序
+ * @param {string} view 返回的字段
+ * @param {boolean} like 是否使用like匹配, 为空使用默认方式
+ * @param {number} timeout 超时时间（毫秒），默认20000ms
+ * @returns {Promise|Array} 查询结果
+ */
+Sql.prototype.list = async function (query, sort, view, like, timeout = 20000) {
+  if (!this.table) {
+    throw new Error('表名未设置');
+  }
+
+  let sql = this.toGetSql(query, sort, view, like);
+  this.sql = sql;
+  let list = await this.run(sql);
+  return list;
+};
+
 /**
  * 统计记录数
  * @param {object} query 查询条件