mm_mysql 1.8.2 → 1.8.3

package/package.json

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

package/sql.js

@@ -483,7 +483,7 @@ Sql.prototype.toWhere = function(obj, like) {
 				where += " and " + escapeId(k.replace('_not', "")) + " != " + val;
 			} else if (k.endWith('_has')) {
 				var vals = val.trim("'").split(',').map((o) => {
-					return  "'" + o + "'"
+					return "'" + o + "'"
 				});
 				where += " and " + escapeId(k.replace('_has', "")) + " in (" + vals.join(',') + ")";
 			} else if (k.endWith('_like')) {
@@ -509,7 +509,7 @@ Sql.prototype.toWhere = function(obj, like) {
 				where += " and " + escapeId(k.replace('_not', "")) + " != " + val;
 			} else if (k.endWith('_has')) {
 				var vals = val.trim("'").split(',').map((o) => {
-					return  "'" + o + "'"
+					return "'" + o + "'"
 				});
 				where += " and " + escapeId(k.replace('_has', "")) + " in (" + vals.join(',') + ")";
 			} else if (k.endWith('_like')) {
@@ -622,10 +622,11 @@ Sql.prototype.add = function(item) {
 /**
  * @description 删除数据
  * @param {Object} query 查询条件集合
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {Promise|Object} 执行结果
  */
-Sql.prototype.del = function(query) {
-	var sql = this.toDelSql(query);
+Sql.prototype.del = function(query, like) {
+	var sql = this.toDelSql(query, like);
 	return this.exec(sql);
 };
 
@@ -633,10 +634,11 @@ Sql.prototype.del = function(query) {
  * @description 修改数据
  * @param {Object} query 查询条件集合
  * @param {Object} item 修改的键值集合
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {Promise|Object} 执行结果
  */
-Sql.prototype.set = function(query, item) {
-	var sql = this.toSetSql(query, item);
+Sql.prototype.set = function(query, item, like) {
+	var sql = this.toSetSql(query, item, like);
 	return this.exec(sql);
 };
 
@@ -705,26 +707,28 @@ Sql.prototype.addList = function(list, lock = true) {
 /**
  * @description 删除多条数据
  * @param {Array} list 对象数组
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {Promise|Object} 执行结果
  */
-Sql.prototype.delList = function(list) {
+Sql.prototype.delList = function(list, like) {
 	var sql = "";
 	var len = list.length;
 	for (var i = 0; i < len; i++) {
-		sql += this.toDelSql(list[i].query);
+		sql += this.toDelSql(list[i].query, like);
 	}
 	return this.exec(sql);
 };
 /**
  * @description 修改多条数据
  * @param {Array} list 对象数组
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {Promise|Object} 执行结果
  */
-Sql.prototype.setList = function(list) {
+Sql.prototype.setList = function(list, like) {
 	var sql = "";
 	var len = list.length;
 	for (var i = 0; i < len; i++) {
-		sql += this.toSetSql(list[i].query, list[i].item);
+		sql += this.toSetSql(list[i].query, list[i].item, like);
 	}
 	return this.exec(sql);
 };
@@ -917,25 +921,32 @@ Sql.prototype.model = function(model) {
 	var _this = this;
 	return new Proxy(model, {
 		set: function(obj, prop, value) {
-			if (typeof(value) === "number") {
-				var n = obj[prop];
-				var cha = value - n;
-				if (cha > 0) {
-					_this.setSql("`" + _this.key + "`=" + obj[_this.key], "`" + prop + "`=`" +
-						prop + "` + " + cha);
-				} else if (cha < 0) {
-					_this.setSql("`" + _this.key + "`=" + obj[_this.key], "`" + prop + "`=`" +
-						prop + "` - " + (-cha));
+			if (_this.key) {
+				var query = {};
+				var arr = _this.key.split(',');
+				for (var i = 0; i < arr.length; i++) {
+					var key = arr[i];
+					query[key] = obj[key];
+				}
+				if (typeof(value) === "number") {
+					var n = obj[prop];
+					var cha = value - n;
+					var where = _this.toWhere(query);
+					if (cha > 0) {
+						_this.setSql(where, "`" + prop + "` = `" +
+							prop + "` + " + cha);
+					} else if (cha < 0) {
+						_this.setSql(where, "`" + prop + "` = `" +
+							prop + "` - " + (-cha));
+					} else {
+						_this.setSql(where, "`" + prop + "` = " +
+							value);
+					}
 				} else {
-					_this.setSql("`" + _this.key + "`=" + obj[_this.key], "`" + prop + "`=" +
-						value);
+					var set = {};
+					set[prop] = value;
+					_this.set(query, set, false);
 				}
-			} else {
-				var query = {};
-				query[_this.key] = obj[_this.key];
-				var set = {};
-				set[prop] = value;
-				_this.set(query, set);
 			}
 			obj[prop] = value;
 			return obj;
@@ -960,9 +971,6 @@ Sql.prototype.getObj = async function(query, sort, view, like) {
 			view += "," + escapeId(key);
 		}
 	}
-	if (like === undefined) {
-		like = this.like;
-	}
 	var sql = this.toGetSql(query, sort, view, like);
 	var list = await this.run(sql);
 	if (list.length > 0) {

package/test.js

@@ -84,13 +84,34 @@ async function test() {
 		"password": "Asd159357"
 	});
 	sql.open();
-	
+
 	db.table = "user_account";
+	db.key = "user_id,username";
+	var obj = await db.getObj({
+		user_id_has: "1"
+	});
+	obj.vip += 1;
+	// obj.vip -= 1;
+	console.log("语法", db.sql, obj);
+
+	obj.nickname = '管理员';
+	// obj.vip -= 1;
+	console.log("语法2", db.sql, obj);
+
 	var list = await db.get({
 		user_id_has: "1,2,a-3,4,5"
 	});
-	
 	console.log("语法", db.sql, list.length);
+
+	var list = await db.get({
+		user_id: "1"
+	});
+	console.log("查询语法", db.sql, list.length);
+
+	var list = await db.get({
+		user_id: "1"
+	}, null, null, true);
+	console.log("模糊查询语法", db.sql, list.length);
 }
 test();