mm_mysql 1.7.4 → 1.7.5

package/package.json

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

package/sql.js

@@ -389,7 +389,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 +455,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 +478,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;
 			}
 		}
 	}

package/test.js

@@ -81,7 +81,7 @@ 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;
@@ -91,15 +91,18 @@ async function test_tpl_get() {
 	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.gm = "'5";
 	// // await db.add(o);
+	await db.set({
+		user_id: o.user_id
+	}, o);
 	// await db.addOrSet({
 	// 	user_id: o.user_id
 	// }, o);
-	// console.log(db.sql);
+	console.log(db.sql);
 
 	ret = await db.groupSumSql(query_str, "mc", "gm");
 	console.log('求和查询结果', ret);