mm_mysql 1.7.4 → 1.7.6

package/index.js

@@ -143,7 +143,6 @@ class Mysql {
 				$.log.debug("SQL：", sql);
 			}
 			// $this.conn.config.connectionConfig = false;
-			// console.log("测试", $this.conn.config.connectionConfig);
 			// 返回一个 Promise
 			return new Promise((resolve, reject) => {
 				$this.conn.getConnection(function(err, db) {

package/package.json

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

package/sql.js

@@ -192,12 +192,12 @@ Sql.prototype.toQuery = function(where, sort, view) {
 		sql += " WHERE " + where;
 	}
 	if (sort) {
-		sql += " ORDER BY " + sort.replace(/;/, '');
+		sql += " ORDER BY " + sort.replace(/;/, "");
 	}
 	sql = sql.replace("{0}", this.table).replace("{1}", view);
 	if (this.size && this.page) {
 		var start = this.size * (this.page - 1);
-		sql += " limit " + start + ',' + this.size;
+		sql += " limit " + start + "," + this.size;
 	}
 	return sql;
 };
@@ -252,24 +252,38 @@ Sql.prototype.getSql = function(where, sort, view) {
  * @param {String} set 修改的键值
  * @return {Promise|Object} 执行结果
  */
-Sql.prototype.addOrSetSql = async function(where, set) {
+Sql.prototype.addOrSetSql = async function(where, set, like) {
 	if (!where || !set) {
 		return -1;
 	}
+	if (typeof(where) === "object") {
+		where = await this.toWhere(where);
+	}
 	var count = await this.countSql(where);
 	if (count === 0) {
-		var arr = set.split(',');
 		var key = "";
 		var value = "";
-		for (var i = 0; i < arr.length; i++) {
-			var o = arr[i];
-			var ar = o.split('=');
-			if (ar.length === 2) {
-				key += "," + ar[0];
-				value += "," + ar[1];
+		if (typeof(set) === "string") {
+			var arr = set.split(",");
+			for (var i = 0; i < arr.length; i++) {
+				var o = arr[i];
+				var ar = o.split('=');
+				if (ar.length === 2) {
+					key += "," + ar[0];
+					value += "," + ar[1];
+				}
+			}
+		} else {
+			for (var k in set) {
+				key += "," + k;
+				var val = set[k];
+				if (val && typeof(val) === "string") {
+					val = val.trim("'");
+				}
+				value += "," + escape(val);
 			}
 		}
-		return await this.addSql(key.replace(',', ''), value.replace(',', ''));
+		return await this.addSql(key.replace(",", ""), value.replace(",", ""));
 	}
 	return await this.setSql(where, set);
 };
@@ -348,7 +362,7 @@ Sql.prototype.groupMathSql = async function(where, groupby, view, sort, method)
 	}
 	if (this.size && this.page) {
 		var start = this.size * (this.page - 1);
-		sql += " limit " + start + ',' + this.size;
+		sql += " limit " + start + "," + this.size;
 	}
 	return await this.run(sql);
 }
@@ -389,7 +403,6 @@ Sql.prototype.groupCountSql = async function(where, groupby, view, sort) {
 	return await this.groupMathSql(where, groupby, view, sort, "COUNT");
 };
 
-
 /**
  * @description 统计学
  * @param {Object} query 查询条件
@@ -456,18 +469,21 @@ Sql.prototype.toWhere = function(obj, like) {
 			if (val && typeof(val) === "string") {
 				val = val.trim("'");
 			}
+			val = escape(val);
 			if (k.endWith('_min')) {
-				where += " and " + escapeId(k.replace('_min', '')) + " >= " + escape(val);
+				where += " and " + escapeId(k.replace('_min', "")) + " >= " + val;
 			} else if (k.endWith('_max')) {
-				where += " and " + escapeId(k.replace('_max', '')) + " <= " + escape(val);
+				where += " and " + escapeId(k.replace('_max', "")) + " <= " + val;
 			} else if (k.endWith('_not')) {
-				where += " and " + escapeId(k.replace('_not', '')) + " != " + escape(val);
+				where += " and " + escapeId(k.replace('_not', "")) + " != " + val;
 			} else if (k.endWith('_has')) {
-				where += " and " + escapeId(k.replace('_has', '')) + " in (" + val + ")";
+				where += " and " + escapeId(k.replace('_has', "")) + " in (" + val.trim("'") + ")";
+			} else if (k.endWith('_like')) {
+				where += " and " + escapeId(k) + " LIKE '%" + val.trim("'") + "%'";
 			} else if (typeof(val) === "string" && !/^[0-9]+$/.test(val)) {
-				where += " and " + escapeId(k) + " LIKE '%" + escape(val).trim("'") + "%'"
+				where += " and " + escapeId(k) + " LIKE '%" + val.trim("'") + "%'";
 			} else {
-				where += " and " + escapeId(k) + " = " + val
+				where += " and " + escapeId(k) + " = " + val;
 			}
 		}
 	} else {
@@ -476,16 +492,19 @@ Sql.prototype.toWhere = function(obj, like) {
 			if (val && typeof(val) === "string") {
 				val = val.trim("'");
 			}
+			val = escape(val);
 			if (k.endWith('_min')) {
-				where += " and " + escapeId(k.replace('_min', '')) + " >= " + escape(val);
+				where += " and " + escapeId(k.replace('_min', "")) + " >= " + val;
 			} else if (k.endWith('_max')) {
-				where += " and " + escapeId(k.replace('_max', '')) + " <= " + escape(val);
+				where += " and " + escapeId(k.replace('_max', "")) + " <= " + val;
 			} else if (k.endWith('_not')) {
-				where += " and " + escapeId(k.replace('_not', '')) + " != " + escape(val);
+				where += " and " + escapeId(k.replace('_not', "")) + " != " + val;
 			} else if (k.endWith('_has')) {
-				where += " and " + escapeId(k.replace('_has', '')) + " in (" + val.replace(/`/gi, "") + ")";
+				where += " and " + escapeId(k.replace('_has', "")) + " in (" + val.trim("'") + ")";
+			} else if (k.endWith('_like')) {
+				where += " and " + escapeId(k) + " LIKE '%" + val.trim("'") + "%'";
 			} else {
-				where += " and " + escapeId(k) + "=" + escape(val);
+				where += " and " + escapeId(k) + " = " + val;
 			}
 		}
 	}
@@ -506,10 +525,10 @@ Sql.prototype.toSet = function(obj) {
 		}
 		val = escape(val);
 		if (k.endWith('_add')) {
-			var k2 = escapeId(k.replace('_add', ''));
+			var k2 = escapeId(k.replace('_add', ""));
 			set += "," + k2 + " = " + k2 + " + " + val;
 		} else if (k.endWith('_del')) {
-			var k3 = escapeId(k.replace('_del', ''));
+			var k3 = escapeId(k.replace('_del', ""));
 			set += "," + k3 + " = " + k3 + " - " + val;
 		} else {
 			set += "," + escapeId(k) + " = " + val;
@@ -586,6 +605,7 @@ Sql.prototype.add = function(item) {
 	var sql = this.toAddSql(item);
 	return this.exec(sql);
 };
+
 /**
  * @description 删除数据
  * @param {Object} query 查询条件集合
@@ -628,7 +648,7 @@ Sql.prototype.get = function(query, sort, view, like = true) {
  * @return {Promise|Object} 执行结果
  */
 Sql.prototype.addOrSet = async function(where, set, like) {
-	return await this.addOrSetSql(this.toWhere(where, like), this.toSet(set));
+	return await this.addOrSetSql(where, set, like);
 };
 
 /**
@@ -707,7 +727,7 @@ Sql.prototype.has_param = function(paramDt, sqlDt) {
 	var bl = false;
 	for (var key in sqlDt) {
 		var value = paramDt[key];
-		if (value !== undefined && value !== null && value !== '') {
+		if (value !== undefined && value !== null && value !== "") {
 			bl = true;
 			break;
 		}
@@ -760,7 +780,7 @@ Sql.prototype.tpl_query = function(paramDt, sqlDt) {
 		var l = this.config.separator;
 		if (l) {
 			for (var key in paramDt) {
-				var value = paramDt[key] + '';
+				var value = paramDt[key] + "";
 				var arr = value.split(l);
 				var tpl = sqlDt[key];
 				if (tpl) {

package/test.js

@@ -1,5 +1,13 @@
 const Mysql = require('./index.js').Mysql;
 
+
+// function test() {
+// 	var setSql = "`nickname`='hao,1,2,3',`gm`=5,`mc`=2,`group`='2,3'";
+// 	var mh = setSql.match(/'.*'/);
+// 	console.log(mh);
+// }
+// test();
+// return
 // var sql = new Mysql();
 // sql.setConfig({
 // 	multipleStatements: true
@@ -81,24 +89,28 @@ async function test_tpl_get() {
 	db.table = 'user_account';
 	var query = {
 		gm_min: 2,
-		username: 'ad%m'
+		username: 'ad%m|882'
 	};
 	db.page = 1;
 	db.size = 5;
 	var query_str = db.tpl_query(query, tpl.query);
 	ret = await db.getCountSql(query_str, "`user_id` desc", "*");
-	
+
 	console.log('查询结果', ret);
 	console.log('SQL语句', db.sql);
-	
-	// var o = ret.list[0];
+
+	var o = ret.list[0];
 	// console.log("查询结果", o);
-	// // o.user_id = await db.count() + 1;
-	// o.gm = "'5";
+	o.user_id = await db.count() + 1;
+	o.nickname = o.nickname + ",6,7";
+	o.gm = "'5";
 	// // await db.add(o);
-	// await db.addOrSet({
+	// await db.set({
 	// 	user_id: o.user_id
 	// }, o);
+	await db.addOrSet({
+		user_id: o.user_id
+	}, o);
 	// console.log(db.sql);
 
 	ret = await db.groupSumSql(query_str, "mc", "gm");