mm_mysql 1.8.0 → 1.8.2

package/package.json

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

package/sql.js

@@ -250,6 +250,7 @@ Sql.prototype.getSql = function(where, sort, view) {
  * @description 添加或修改
  * @param {String} where 查询条件
  * @param {String} set 修改的键值
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {Promise|Object} 执行结果
  */
 Sql.prototype.addOrSetSql = async function(where, set, like) {
@@ -257,7 +258,7 @@ Sql.prototype.addOrSetSql = async function(where, set, like) {
 		return -1;
 	}
 	if (typeof(where) === "object") {
-		where = await this.toWhere(where);
+		where = await this.toWhere(where, like);
 	}
 	var count = await this.countSql(where);
 	if (count === 0) {
@@ -412,10 +413,11 @@ Sql.prototype.groupCountSql = async function(where, groupby, view, sort) {
  * @param {String} groupby 分组的字段
  * @param {String} view 返回的字段
  * @param {String} sort 排序方式
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {Promise|Object} 查询到的内容列表和符合条件总数
  */
-Sql.prototype.groupMath = async function(query, groupby, view, sort, method) {
-	var where = this.toWhere(query, this.like);
+Sql.prototype.groupMath = async function(query, groupby, view, sort, method, like) {
+	var where = this.toWhere(query, like);
 	return await this.groupMathSql(where, groupby, view, sort, method);
 };
 
@@ -458,7 +460,7 @@ Sql.prototype.groupCount = async function(query, groupby, view, sort) {
 /**
  * @description 转为where语句
  * @param {Object} obj 用作拼接的对象
- * @param {Boolean} like 是否使用like匹配, 默认不使用
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {String} where格式sql语句字符串
  */
 Sql.prototype.toWhere = function(obj, like) {
@@ -480,7 +482,10 @@ Sql.prototype.toWhere = function(obj, like) {
 			} else if (k.endWith('_not')) {
 				where += " and " + escapeId(k.replace('_not', "")) + " != " + val;
 			} else if (k.endWith('_has')) {
-				where += " and " + escapeId(k.replace('_has', "")) + " in (" + val.trim("'") + ")";
+				var vals = val.trim("'").split(',').map((o) => {
+					return  "'" + o + "'"
+				});
+				where += " and " + escapeId(k.replace('_has', "")) + " in (" + vals.join(',') + ")";
 			} else if (k.endWith('_like')) {
 				where += " and " + escapeId(k) + " LIKE '%" + val.trim("'") + "%'";
 			} else if (typeof(val) === "string" && !/^[0-9]+$/.test(val)) {
@@ -503,7 +508,10 @@ Sql.prototype.toWhere = function(obj, like) {
 			} else if (k.endWith('_not')) {
 				where += " and " + escapeId(k.replace('_not', "")) + " != " + val;
 			} else if (k.endWith('_has')) {
-				where += " and " + escapeId(k.replace('_has', "")) + " in (" + val.trim("'") + ")";
+				var vals = val.trim("'").split(',').map((o) => {
+					return  "'" + o + "'"
+				});
+				where += " and " + escapeId(k.replace('_has', "")) + " in (" + vals.join(',') + ")";
 			} else if (k.endWith('_like')) {
 				where += " and " + escapeId(k) + " LIKE '%" + val.trim("'") + "%'";
 			} else {
@@ -564,10 +572,11 @@ Sql.prototype.toAddSql = function(item) {
 /**
  * @description 转删除sql语句
  * @param {Object} query 查询键值
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {String} sql语句
  */
-Sql.prototype.toDelSql = function(query) {
-	var where = this.toWhere(query);
+Sql.prototype.toDelSql = function(query, like) {
+	var where = this.toWhere(query, like);
 	var sql = "DELETE FROM `{0}` WHERE {1};";
 	return sql.replace("{0}", this.table).replace("{1}", where);
 };
@@ -576,10 +585,11 @@ Sql.prototype.toDelSql = function(query) {
  * @description 转修改sql语句
  * @param {Object} query 查询的键值集合
  * @param {Object} item 修改的键值集合
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {String} sql语句
  */
-Sql.prototype.toSetSql = function(query, item) {
-	var where = this.toWhere(query);
+Sql.prototype.toSetSql = function(query, item, like) {
+	var where = this.toWhere(query, like);
 	var set = this.toSet(item);
 	var sql = "UPDATE `{0}` SET {1} WHERE {2};";
 	return sql.replace("{0}", this.table).replace("{1}", set).replace("{2}", where);
@@ -590,10 +600,10 @@ Sql.prototype.toSetSql = function(query, item) {
  * @param {Object} query 查询键值集合
  * @param {String} sort 排序规则
  * @param {String} view 显示的字段
- * @param {Boolean} like 是否使用like匹配, 默认使用
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {String} sql语句
  */
-Sql.prototype.toGetSql = function(query, sort, view, like = true) {
+Sql.prototype.toGetSql = function(query, sort, view, like) {
 	var where = this.toWhere(query, like);
 	var sql = this.toQuery(where, sort, view);
 	return sql;
@@ -635,10 +645,10 @@ Sql.prototype.set = function(query, item) {
  * @param {Object} query 查询条件
  * @param {String} sort 排序
  * @param {String} view 返回的字段
- * @param {Boolean} like 是否使用like匹配, 默认使用
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {Promise|Array} 查询结果
  */
-Sql.prototype.get = function(query, sort, view, like = true) {
+Sql.prototype.get = function(query, sort, view, like) {
 	var sql = this.toGetSql(query, sort, view, like);
 	return this.run(sql);
 };
@@ -647,7 +657,7 @@ Sql.prototype.get = function(query, sort, view, like = true) {
  * @description 添加或修改
  * @param {Object} where 查询条件集合
  * @param {Object} set 修改的键值
- * @param {Boolean} like 是否使用like匹配, 默认不使用
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {Promise|Object} 执行结果
  */
 Sql.prototype.addOrSet = async function(where, set, like) {
@@ -657,10 +667,10 @@ Sql.prototype.addOrSet = async function(where, set, like) {
 /**
  * @description 查询符合结果总数
  * @param {Object} query 查询条件集合
- * @param {Boolean} like 是否使用like匹配, 默认使用
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {Promise|Number} 查询结果
  */
-Sql.prototype.count = function(query, like = true) {
+Sql.prototype.count = function(query, like) {
 	return this.countSql(this.toWhere(query, like));
 };
 
@@ -669,10 +679,10 @@ Sql.prototype.count = function(query, like = true) {
  * @param {Object} query 查询条件
  * @param {String} sort 排序
  * @param {String} view 返回的字段
- * @param {Boolean} like 是否使用like匹配, 默认使用
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {Promise|Object} 查询到的内容列表和符合条件总数
  */
-Sql.prototype.getCount = async function(query, sort, view, like = true) {
+Sql.prototype.getCount = async function(query, sort, view, like) {
 	return this.getCountSql(this.toWhere(query, like), sort, view);
 };
 
@@ -938,7 +948,7 @@ Sql.prototype.model = function(model) {
  * @param {Object} query 查询条件
  * @param {String} sort 排序
  * @param {String} view 返回的字段
- * @param {Boolean} like 是否like匹配
+ * @param {Boolean} like 是否使用like匹配, 为空使用默认方式
  * @return {Promise|Array} 查询结果
  */
 Sql.prototype.getObj = async function(query, sort, view, like) {

package/test.js

@@ -76,47 +76,65 @@ var tpl = {
 // }
 // test_tpl_set();
 
-// 测试模板查询
-async function test_tpl_get() {
+async function test() {
 	var sql = new Mysql();
+	var db = sql.db();
 	sql.setConfig({
 		"user": "root",
 		"password": "Asd159357"
 	});
 	sql.open();
-	db = sql.db();
-	var num = 0;
-	db.table = 'user_account';
-	var query = {
-		gm_min: 2,
-		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];
-	// console.log("查询结果", o);
-	o.user_id = await db.count() + 1;
-	o.nickname = o.nickname + ",6,7";
-	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);
-
-	ret = await db.groupSumSql(query_str, "mc", "gm");
-	console.log('求和查询结果', ret);
+	
+	db.table = "user_account";
+	var list = await db.get({
+		user_id_has: "1,2,a-3,4,5"
+	});
+	
+	console.log("语法", db.sql, list.length);
 }
-test_tpl_get();
+test();
+
+// 测试模板查询
+// async function test_tpl_get() {
+// 	var sql = new Mysql();
+// 	sql.setConfig({
+// 		"user": "root",
+// 		"password": "Asd159357"
+// 	});
+// 	sql.open();
+// 	db = sql.db();
+// 	var num = 0;
+// 	db.table = 'user_account';
+// 	var query = {
+// 		gm_min: 2,
+// 		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];
+// 	// console.log("查询结果", o);
+// 	o.user_id = await db.count() + 1;
+// 	o.nickname = o.nickname + ",6,7";
+// 	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);
+
+// 	ret = await db.groupSumSql(query_str, "mc", "gm");
+// 	console.log('求和查询结果', ret);
+// }
+// test_tpl_get();
 
 // async function addField() {
 // 	var sql = new Mysql();