mm_mysql 1.7.9 → 1.8.1

package/package.json

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

package/sql.js

@@ -480,7 +480,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 +506,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 {

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();