mm_mysql 1.7.2 → 1.7.4

package/package.json

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

package/sql.js

@@ -328,20 +328,20 @@ Sql.prototype.groupMathSql = async function(where, groupby, view, sort, method)
 	if (view.indexOf(",") !== -1) {
 		var arr = view.split(",");
 		for (var i = 0; i < arr.length; i++) {
-			var str = this.escapeId(arr[i]);
+			var str = escapeId(arr[i]);
 			viewStr += "," + method.toUpperCase() + "(" + str + ") " + method.toLowerCase() + "_" + str.replace(
 				/`/g, "")
 		}
 	} else {
-		viewStr = "," + method.toUpperCase() + "(" + this.escapeId(view) + ") " + method.toLowerCase() + "_" +
+		viewStr = "," + method.toUpperCase() + "(" + escapeId(view) + ") " + method.toLowerCase() + "_" +
 			view.replace(/`/g, "")
 	}
-	var sql = "SELECT " + (groupby ? this.escapeId(groupby) : "") + viewStr + " FROM `" + this.table + "`";
+	var sql = "SELECT " + (groupby ? escapeId(groupby) : "") + viewStr + " FROM `" + this.table + "`";
 	if (where) {
 		sql += ' WHERE ' + where;
 	}
 	if (groupby) {
-		sql += " GROUP BY " + this.escapeId(groupby);
+		sql += " GROUP BY " + escapeId(groupby);
 	}
 	if (sort) {
 		sql += " ORDER BY " + sort;
@@ -453,34 +453,39 @@ Sql.prototype.toWhere = function(obj, like) {
 	if (like) {
 		for (var k in obj) {
 			var val = obj[k];
+			if (val && typeof(val) === "string") {
+				val = val.trim("'");
+			}
 			if (k.endWith('_min')) {
-				where += " and " + this.escapeId(k.replace('_min', '')) + " >= " + this.escape(val);
+				where += " and " + escapeId(k.replace('_min', '')) + " >= " + escape(val);
 			} else if (k.endWith('_max')) {
-				where += " and " + this.escapeId(k.replace('_max', '')) + " <= " + this.escape(val);
+				where += " and " + escapeId(k.replace('_max', '')) + " <= " + escape(val);
 			} else if (k.endWith('_not')) {
-				where += " and " + this.escapeId(k.replace('_not', '')) + " != " + this.escape(val);
+				where += " and " + escapeId(k.replace('_not', '')) + " != " + escape(val);
 			} else if (k.endWith('_has')) {
-				where += " and " + this.escapeId(k.replace('_has', '')) + " in (" + val + ")";
+				where += " and " + escapeId(k.replace('_has', '')) + " in (" + val + ")";
 			} else if (typeof(val) === "string" && !/^[0-9]+$/.test(val)) {
-				where += " and " + this.escapeId(k) + " LIKE '%" + this.escape(val).trim("'") + "%'"
+				where += " and " + escapeId(k) + " LIKE '%" + escape(val).trim("'") + "%'"
 			} else {
-				where += " and " + this.escapeId(k) + " = " + val
+				where += " and " + escapeId(k) + " = " + val
 			}
 		}
 	} else {
 		for (var k in obj) {
 			var val = obj[k];
+			if (val && typeof(val) === "string") {
+				val = val.trim("'");
+			}
 			if (k.endWith('_min')) {
-				where += " and " + this.escapeId(k.replace('_min', '')) + " >= " + this.escape(val.replace('_min',
-					''));
+				where += " and " + escapeId(k.replace('_min', '')) + " >= " + escape(val);
 			} else if (k.endWith('_max')) {
-				where += " and " + this.escapeId(k.replace('_max', '')) + " <= " + this.escape(val);
+				where += " and " + escapeId(k.replace('_max', '')) + " <= " + escape(val);
 			} else if (k.endWith('_not')) {
-				where += " and " + this.escapeId(k.replace('_not', '')) + " != " + this.escape(val);
+				where += " and " + escapeId(k.replace('_not', '')) + " != " + escape(val);
 			} else if (k.endWith('_has')) {
-				where += " and " + this.escapeId(k.replace('_has', '')) + " in (" + val.replace(/`/gi, "") + ")";
+				where += " and " + escapeId(k.replace('_has', '')) + " in (" + val.replace(/`/gi, "") + ")";
 			} else {
-				where += " and " + this.escapeId(k) + "=" + this.escape(val);
+				where += " and " + escapeId(k) + "=" + escape(val);
 			}
 		}
 	}
@@ -495,15 +500,19 @@ Sql.prototype.toWhere = function(obj, like) {
 Sql.prototype.toSet = function(obj) {
 	var set = "";
 	for (var k in obj) {
-		var val = this.escape(obj[k]);
+		var val = obj[k];
+		if (val && typeof(val) == "string") {
+			val = val.trim("'");
+		}
+		val = escape(val);
 		if (k.endWith('_add')) {
-			var k2 = this.escapeId(k.replace('_add', ''));
+			var k2 = escapeId(k.replace('_add', ''));
 			set += "," + k2 + " = " + k2 + " + " + val;
 		} else if (k.endWith('_del')) {
-			var k3 = this.escapeId(k.replace('_del', ''));
+			var k3 = escapeId(k.replace('_del', ''));
 			set += "," + k3 + " = " + k3 + " - " + val;
 		} else {
-			set += "," + this.escapeId(k) + " = " + val;
+			set += "," + escapeId(k) + " = " + val;
 		}
 	}
 	return set.replace(",", "");
@@ -516,13 +525,18 @@ Sql.prototype.toSet = function(obj) {
  */
 Sql.prototype.toAddSql = function(item) {
 	var key = "";
-	var val = "";
+	var value = "";
 	for (var k in item) {
-		key += "," + this.escapeId(k);
-		val += "," + this.escape(item[k]);
+		key += "," + escapeId(k);
+		var val = item[k];
+		if (val && typeof(val) == "string") {
+			val = val.trim("'");
+		}
+		value += "," + escape(val);
 	}
 	var sql = "INSERT INTO `{0}` ({1}) VALUES ({2});";
-	return sql.replace("{0}", this.table).replace("{1}", key.replace(",", "")).replace("{2}", val.replace(",", ""));
+	return sql.replace("{0}", this.table).replace("{1}", key.replace(",", "")).replace("{2}", value.replace(",",
+		""));
 };
 
 /**
@@ -755,12 +769,19 @@ Sql.prototype.tpl_query = function(paramDt, sqlDt) {
 						var sl = "(";
 						var len = arr.length;
 						for (var i = 0; i < len; i++) {
-							sl += " || " + tpl.replaceAll("{0}", this.escape(arr[i]).trim("'"));
+							var val = arr[i];
+							if (val && typeof(val) == "string") {
+								val = val.trim("'");
+							}
+							sl += " || " + tpl.replaceAll("{0}", escape(val).trim("'"));
 						}
 						sl = sl.replace(" || ", "") + ")";
 						sql += " && " + sl;
 					} else {
-						sql += " && " + tpl.replaceAll("{0}", this.escape(value).trim("'"));
+						if (value && typeof(value) == "string") {
+							value = value.trim("'");
+						}
+						sql += " && " + tpl.replaceAll("{0}", escape(value).trim("'"));
 					}
 				} else {
 					if (arr.length > 1) {
@@ -768,22 +789,33 @@ Sql.prototype.tpl_query = function(paramDt, sqlDt) {
 						var sl = "(";
 						var len = arr.length;
 						for (var i = 0; i < len; i++) {
-							sl += " || " + this.escapeId(key) + " = " + this.escape(arr[i]);
+							var val = arr[i];
+							if (val && typeof(val) == "string") {
+								val = val.trim("'");
+							}
+							sl += " || " + escapeId(key) + " = " + escape(val);
 						}
 						sl = sl.replace(" || ", "") + ")";
 						sql += " && " + sl;
 					} else {
-						sql += " && " + this.escapeId(key) + " = " + this.escape(value);
+						if (value && typeof(value) == "string") {
+							value = value.trim("'");
+						}
+						sql += " && " + escapeId(key) + " = " + escape(value);
 					}
 				}
 			}
 		} else {
 			for (var key in paramDt) {
-				var value = this.escape(paramDt[key]);
+				var value = paramDt[key];
+				if (value && typeof(value) == "string") {
+					value = value.trim("'");
+				}
+				value = escape(value);
 				if (sqlDt[key]) {
 					sql += " && " + sqlDt[key].replaceAll("{0}", value.trim("'"));
 				} else {
-					sql += " && " + this.escapeId(key) + " = " + value;
+					sql += " && " + escapeId(key) + " = " + value;
 				}
 			}
 		}
@@ -800,18 +832,18 @@ Sql.prototype.tpl_query = function(paramDt, sqlDt) {
 					var sl = "(";
 					var len = arr.length;
 					for (var i = 0; i < len; i++) {
-						sl += " || " + this.escapeId(key) + " = " + this.escape(arr[i]);
+						sl += " || " + escapeId(key) + " = " + escape(arr[i]);
 					}
 					sl = sl.replace(" || ", "") + ")";
 					sql += " && " + sl;
 				} else {
-					sql += " && " + this.escapeId(key) + " = " + this.escape(value);
+					sql += " && " + escapeId(key) + " = " + escape(value);
 				}
 			}
 		} else {
 			// 直接拼接
 			for (var key in paramDt) {
-				sql += " && " + this.escapeId(key) + " = " + this.escape(paramDt[key]);
+				sql += " && " + escapeId(key) + " = " + escape(paramDt[key]);
 			}
 		}
 	}
@@ -828,19 +860,19 @@ Sql.prototype.tpl_body = function(paramDt, sqlDt) {
 	var sql = "";
 	if (!sqlDt || sqlDt.length === 0) {
 		for (var key in paramDt) {
-			sql += " , " + this.escapeId(key) + " = " + this.escape(val[key]);
+			sql += ", " + escapeId(key) + " = " + escape(val[key]);
 		}
 	} else {
 		for (var key in paramDt) {
-			var value = this.escape(paramDt[key]);
+			var value = escape(paramDt[key]);
 			if (sqlDt[key]) {
-				sql += " , " + sqlDt[key].replace("{0}", value).replace('+ -', '- ').replace('- -', '+ ');
+				sql += ", " + sqlDt[key].replace("{0}", value).replace('+ -', '- ').replace('- -', '+ ');
 			} else {
-				sql += " , " + this.escapeId(key) + " = " + value;
+				sql += ", " + escapeId(key) + " = " + value;
 			}
 		}
 	}
-	return sql.replace(" , ", "");
+	return sql.replace(", ", "");
 };
 
 /**
@@ -892,7 +924,7 @@ Sql.prototype.getObj = async function(query, sort, view, like) {
 	var key = this.key;
 	if (key) {
 		if (view && view.indexOf(key) === -1 && view.indexOf('*') === -1) {
-			view += "," + this.escapeId(key);
+			view += "," + escapeId(key);
 		}
 	}
 	if (like === undefined) {
@@ -912,4 +944,4 @@ Sql.prototype.getObj = async function(query, sort, view, like) {
 	}
 };
 
-module.exports = Sql;
+module.exports = Sql;

package/test.js

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