mm_mysql 1.8.6 → 1.8.9

package/index.js

@@ -45,6 +45,8 @@ class Mysql {
 		this.sql = "";
 		// 连接器
 		this.conn;
+		// 连接态 0未连接，1已连接
+		this.state = 0;
 
 		// 数据库配置参数
 		this.config = {
@@ -94,6 +96,9 @@ class Mysql {
 							message: $.info(err).between('Error: ', '\n')
 						};
 						$.log.error("SQL error：", err);
+						if (err.message.indexOf("connect ECONNREFUSED") !== -1) {
+							$this.state = 0;
+						}
 						resolve([]);
 						reject(err);
 					} else {
@@ -146,7 +151,6 @@ class Mysql {
 			if ($this.config.log) {
 				$.log.debug("SQL：", sql);
 			}
-			// $this.conn.config.connectionConfig = false;
 			// 返回一个 Promise
 			return new Promise((resolve, reject) => {
 				$this.conn.getConnection(function(err, db) {
@@ -156,6 +160,9 @@ class Mysql {
 							message: $.info(err).between('Error: ', '\n')
 						};
 						$.log.error("SQL error：", err);
+						if (err.message.indexOf("connect ECONNREFUSED") !== -1) {
+							$this.state = 0;
+						}
 						resolve(-1);
 						reject(err);
 					} else {
@@ -250,9 +257,11 @@ Mysql.prototype.setConfig = function(cg) {
 
 /**
  * @description 打开数据库, 如果没有则建立数据库连接再打开
+ * @param {boolean} 是否重置
  */
-Mysql.prototype.open = function() {
-	if (!pool[this.identifier]) {
+Mysql.prototype.open = function(reset) {
+	if (reset || !this.state || !pool[this.identifier]) {
+		this.state = 1;
 		pool[this.identifier] = createPool(this.config);
 	}
 	this.conn = pool[this.identifier];
@@ -263,7 +272,9 @@ Mysql.prototype.open = function() {
  */
 Mysql.prototype.close = function() {
 	if (pool[this.identifier]) {
+		pool[this.identifier].end();
 		pool[this.identifier] = null;
+		delete pool[this.identifier];
 	}
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mm_mysql",
-	"version": "1.8.6",
+	"version": "1.8.9",
 	"description": "这是超级美眉mysql帮助函数模块，用于便捷操作mysql，使用await方式，可以避免嵌套函数",
 	"main": "index.js",
 	"dependencies": {
@@ -34,4 +34,4 @@
 		"url": "https://github.com/qiuwenwu/mm_mysql/issues"
 	},
 	"homepage": "https://github.com/qiuwenwu/mm_mysql#readme"
-}
+}

package/sql.js

@@ -441,7 +441,7 @@ Sql.prototype.toWhere = function(obj, like) {
 				});
 				where += " and " + escapeId(k.replace('_has', "")) + " in (" + vals.join(',') + ")";
 			} else if (k.endWith('_like')) {
-				where += " and " + escapeId(k) + " LIKE '%" + val.trim("'") + "%'";
+				where += " and " + escapeId(k.replace('_like', "")) + " LIKE '%" + val.trim("'") + "%'";
 			} else if (typeof(val) === "string" && !/^[0-9]+$/.test(val)) {
 				where += " and " + escapeId(k) + " LIKE '%" + val.trim("'") + "%'";
 			} else {
@@ -467,7 +467,7 @@ Sql.prototype.toWhere = function(obj, like) {
 				});
 				where += " and " + escapeId(k.replace('_has', "")) + " in (" + vals.join(',') + ")";
 			} else if (k.endWith('_like')) {
-				where += " and " + escapeId(k) + " LIKE '%" + val.trim("'") + "%'";
+				where += " and " + escapeId(k.replace('_like', "")) + " LIKE '%" + val.trim("'") + "%'";
 			} else {
 				where += " and " + escapeId(k) + " = " + val;
 			}

package/test.js

@@ -77,6 +77,7 @@ var tpl = {
 // test_tpl_set();
 
 async function test() {
+	console.log('测试开始')
 	var sql = new Mysql();
 	var db = sql.db();
 	// 是否输出语法
@@ -89,6 +90,8 @@ async function test() {
 		"password": "Asd159357"
 	});
 	sql.open();
+	// sql.close();
+	// sql.open();
 
 	// --- 测试事件 ---
 	$.eventer.on("mysql_add_before:user_account", function(json) {
@@ -178,8 +181,11 @@ async function test() {
 	}, obj_new);
 	console.log("语法", db.sql, bl);
 }
-
 test();
+// setInterval(() => {
+// 	test();
+// }, 3000)
+
 
 // 测试模板查询
 // async function test_tpl_get() {