mm_mysql 2.0.3 → 2.0.4

package/index.js

@@ -626,8 +626,12 @@ Mysql.prototype.exec = async function (sql, params = [], timeout = null) {
 
     const [rows] = await Promise.race([queryPromise, timeoutPromise]);
 
-    // 对于增删改操作，返回影响的行数
-    return rows.affectedRows || rows.insertId || rows.changedRows || rows;
+    // 返回与mm_sqlite兼容的格式
+    return {
+      affectedRows: rows.affectedRows || 0,
+      insertId: rows.insertId || 0,
+      changedRows: rows.changedRows || 0
+    };
   } catch (err) {
     $.log.error('[Mysql] [exec]', 'SQL执行失败', {
       error: err.message,
@@ -700,8 +704,8 @@ Mysql.prototype.read = async function (table, condition = {}, options = {}) {
       $.log.debug(`[${this.constructor.name}] [read] 查询数据`, { sql, params });
     }
 
-    // 执行查询
-    const results = await this.exec(sql, params);
+    // 执行查询，使用run方法获取数组格式的结果
+    const results = await this.run(sql, params);
 
     if (this.config.debug) {
       $.log.info(`[${this.constructor.name}] [read] 查询成功`, { count: results.length });
@@ -931,10 +935,6 @@ Mysql.prototype._splitSqlStatements = function(sqlContent) {
  * @returns {Object} 包含exec、add、set、get、del等方法的数据库操作对象
  */
 Mysql.prototype.db = function () {
-  if (this._status !== 'connected') {
-    throw new Error('数据库连接未建立');
-  }
-
   return new DB(this);
 };
 
@@ -991,6 +991,47 @@ Mysql.prototype._sleep = function (ms) {
   return new Promise(resolve => setTimeout(resolve, ms));
 };
 
+/**
+ * SQL语法转换方法（与mm_sqlite保持兼容）
+ * @param {String} sql - 原始SQL语句
+ * @returns {String} 转换后的SQL语句
+ */
+Mysql.prototype._convertSqlSyntax = function (sql) {
+  // MySQL不需要特殊的语法转换，直接返回原SQL
+  // 此方法主要用于保持与mm_sqlite的接口兼容性
+  return sql;
+};
+
+/**
+ * 获取数据库路径（与mm_sqlite保持兼容）
+ * @returns {String} 数据库连接信息
+ */
+Mysql.prototype._getDatabasePath = function () {
+  // MySQL不需要文件路径，返回连接信息用于兼容性
+  return `${this.config.host}:${this.config.port}/${this.config.database}`;
+};
+
+/**
+ * 初始化MySQL服务
+ * @async
+ * @returns {Promise<void>}
+ */
+Mysql.prototype.init = async function () {
+  if (this._isInited) {
+    $.log.warn('MySQL服务已初始化');
+    return;
+  }
+
+  try {
+    $.log.debug('[Mysql] [init]', '初始化MySQL服务');
+    await this._initService();
+    await this.open();
+    $.log.debug('[Mysql] [init]', 'MySQL服务初始化完成');
+  } catch (error) {
+    $.log.error('[Mysql] [init]', 'MySQL服务初始化失败', { error: error.message });
+    throw error;
+  }
+};
 
 /**
  * 导出模块

package/package.json

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

package/sql.js

@@ -1625,4 +1625,93 @@ Sql.prototype.model = function (model) {
 	});
 };
 
+/**
+ * 添加或修改数据（存在则修改，不存在则添加）
+ * @param {Object|String} where 查询条件
+ * @param {Object|String} set 要设置的数据
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
+ * @return {Promise<Object>} 执行结果
+ */
+Sql.prototype.addOrSet = async function(where, set, like) {
+	if (!this.table || !where || !set) {
+		throw new Error('表名、条件或数据未设置');
+	}
+	try {
+		let query = where;
+		let body = set;
+		let whereStr;
+
+		if (typeof where === "object") {
+			whereStr = await this.toWhere(where, like);
+		} else {
+			whereStr = where;
+		}
+
+		const count = await this.countSql(whereStr);
+
+		if (count === 0) {
+			let key = "";
+			let value = "";
+
+			if (typeof set === "string") {
+				const arr = set.split(",");
+				for (const o of arr) {
+					const ar = o.split('=');
+					if (ar.length === 2) {
+						key += "," + ar[0];
+						value += "," + ar[1];
+					}
+				}
+			} else {
+				// 触发前置事件
+				if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function' && typeof body === "object") {
+					await $.eventer.run("mysql_add_before:" + this.table, { body });
+				}
+
+				for (const k in set) {
+					if (!Object.prototype.hasOwnProperty.call(set, k)) continue;
+
+					key += "," + escapeId(k);
+					let val = set[k];
+					if (typeof val === "string") {
+						val = val.trim("'");
+					}
+					value += "," + escape(val);
+				}
+			}
+
+			const bl = await this.addSql(key.replace(",", ""), value.replace(",", ""));
+
+			// 触发后置事件
+			if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function' && typeof body === "object") {
+				await $.eventer.run("mysql_add_after:" + this.table, { body, sql: this.sql, error: this.error, bl });
+			}
+
+			return bl;
+		} else {
+			// 触发前置事件
+			if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function' && typeof set === "object") {
+				await $.eventer.run("mysql_set_before:" + this.table, { query, body, like, page: this.page, size: this.size, sql: this.sql });
+			}
+
+			if (typeof set === "object") {
+				set = await this.toSet(set);
+			}
+
+			const bl1 = await this.setSql(whereStr, set);
+
+			// 触发后置事件
+			if (typeof $.eventer === 'object' && typeof $.eventer.run === 'function' && typeof body === "object") {
+				await $.eventer.run("mysql_set_after:" + this.table, { query, body, like, page: this.page, size: this.size, sql: this.sql, error: this.error, bl: bl1 });
+			}
+
+			return bl1;
+		}
+	} catch (err) {
+		this.error = err.message;
+		$.log.error(`添加或修改数据失败: ${err.message}`);
+		throw err;
+	}
+};
+
 module.exports = Sql;