mm_mysql 1.6.7 → 1.7.1

package/config.json

@@ -2,7 +2,7 @@
 	"host": "localhost",
 	"port": 3306,
 	"user": "root",
-	"password": "asd123",
+	"password": "asd159357",
 	"database": "mm",
 	"multipleStatements": true
 }

package/db.js

@@ -221,7 +221,14 @@ DB.prototype.setType = function(field, type, value, not_null, auto) {
 				type += " DEFAULT 0";
 			}
 			break;
+		case "longtext":
 		case "text":
+			if (type == "text") {
+				type = "text NULL"
+			}
+			else if (type == "longtext") {
+				type = "longtext NULL"
+			}
 			break;
 		default:
 			if (type.indexOf('var') !== -1) {
@@ -340,7 +347,7 @@ DB.prototype.field_set = async function(field, type, value, not_null, auto, isKe
 
 	var type = this.setType(field, type, value, not_null, auto);
 	if (type.has('text')) {
-		type = type.replace('NOT NULL', '');
+		type = type.replace('NOT NULL', '').replace("DEFAULT ''", "");
 	}
 
 	if (!new_name) {

package/package.json

@@ -1,10 +1,11 @@
 {
     "name": "mm_mysql",
-    "version": "1.6.7",
+    "version": "1.7.1",
     "description": "这是超级美眉mysql帮助函数模块，用于便捷操作mysql，使用await方式，可以避免嵌套函数",
     "main": "index.js",
     "scripts": {
-        "test": "node test.js"
+        "test": "node test.js",
+        "dev": "nodemon test.js"
     },
     "repository": {
         "type": "git",
@@ -30,6 +31,7 @@
     },
     "homepage": "https://github.com/qiuwenwu/mm_mysql#readme",
     "dependencies": {
+        "mm_expand": "^1.5.1",
         "mm_logs": "^1.0.7",
         "mysql": "^2.17.1"
     }

package/sql.js

@@ -138,6 +138,8 @@ class Sql {
 				"count_ret": "count_ret"
 			}
 		};
+
+		this.like = false;
 	}
 }
 
@@ -318,8 +320,7 @@ Sql.prototype.getCountSql = async function(where, sort, view) {
  * @param {String} sort 排序方式
  * @return {Promise|Object} 查询到的内容列表和符合条件总数
  */
-Sql.prototype.groupMath = async function(where, groupby, view, sort, method) {
-	var where = this.toWhere(where, false);
+Sql.prototype.groupMathSql = async function(where, groupby, view, sort, method) {
 	if (!view) {
 		view = "*"
 	}
@@ -350,7 +351,8 @@ Sql.prototype.groupMath = async function(where, groupby, view, sort, method) {
 		sql += " limit " + start + ',' + this.size;
 	}
 	return await this.run(sql);
-};
+}
+
 
 /**
  * @description 分组求平均值
@@ -360,8 +362,8 @@ Sql.prototype.groupMath = async function(where, groupby, view, sort, method) {
  * @param {String} sort 排序方式
  * @return {Promise|Object} 查询到的内容列表和符合条件总数
  */
-Sql.prototype.groupAvg = async function(where, groupby, view, sort) {
-	return await this.groupMath(where, groupby, view, sort, "AVG");
+Sql.prototype.groupAvgSql = async function(where, groupby, view, sort) {
+	return await this.groupMathSql(where, groupby, view, sort, "AVG");
 };
 
 /**
@@ -372,8 +374,8 @@ Sql.prototype.groupAvg = async function(where, groupby, view, sort) {
  * @param {String} sort 排序方式
  * @return {Promise|Object} 查询到的内容列表和符合条件总数
  */
-Sql.prototype.groupSum = async function(where, groupby, view, sort) {
-	return await this.groupMath(where, groupby, view, sort, "SUM");
+Sql.prototype.groupSumSql = async function(where, groupby, view, sort) {
+	return await this.groupMathSql(where, groupby, view, sort, "SUM");
 };
 
 /**
@@ -383,8 +385,57 @@ Sql.prototype.groupSum = async function(where, groupby, view, sort) {
  * @param {String} view 返回的字段
  * @return {Promise|Object} 查询到的内容列表和符合条件总数
  */
-Sql.prototype.groupCount = async function(where, groupby, view, sort) {
-	return await this.groupMath(where, groupby, view, sort, "COUNT");
+Sql.prototype.groupCountSql = async function(where, groupby, view, sort) {
+	return await this.groupMathSql(where, groupby, view, sort, "COUNT");
+};
+
+
+/**
+ * @description 统计学
+ * @param {Object} query 查询条件
+ * @param {String} groupby 分组的字段
+ * @param {String} view 返回的字段
+ * @param {String} sort 排序方式
+ * @return {Promise|Object} 查询到的内容列表和符合条件总数
+ */
+Sql.prototype.groupMath = async function(query, groupby, view, sort, method) {
+	var where = this.toWhere(query, this.like);
+	return await this.groupMathSql(where, groupby, view, sort, method);
+};
+
+/**
+ * @description 分组求平均值
+ * @param {Object} query 查询条件
+ * @param {String} groupby 分组的字段
+ * @param {String} view 返回的字段
+ * @param {String} sort 排序方式
+ * @return {Promise|Object} 查询到的内容列表和符合条件总数
+ */
+Sql.prototype.groupAvg = async function(query, groupby, view, sort) {
+	return await this.groupMath(query, groupby, view, sort, "AVG");
+};
+
+/**
+ * @description 分组合计数值
+ * @param {Object} query 查询条件
+ * @param {String} groupby 分组的字段
+ * @param {String} view 返回的字段
+ * @param {String} sort 排序方式
+ * @return {Promise|Object} 查询到的内容列表和符合条件总数
+ */
+Sql.prototype.groupSum = async function(query, groupby, view, sort) {
+	return await this.groupMath(query, groupby, view, sort, "SUM");
+};
+
+/**
+ * @description 分组合计不同条数
+ * @param {Object} query 查询条件
+ * @param {String} groupby 分组的字段
+ * @param {String} view 返回的字段
+ * @return {Promise|Object} 查询到的内容列表和符合条件总数
+ */
+Sql.prototype.groupCount = async function(query, groupby, view, sort) {
+	return await this.groupMath(query, groupby, view, sort, "COUNT");
 };
 
 /* ===  sql语句拼接函数  === */
@@ -396,6 +447,9 @@ Sql.prototype.groupCount = async function(where, groupby, view, sort) {
  */
 Sql.prototype.toWhere = function(obj, like) {
 	var where = "";
+	if (like === undefined) {
+		like = this.like;
+	}
 	if (like) {
 		for (var k in obj) {
 			var val = obj[k];
@@ -832,7 +886,7 @@ Sql.prototype.model = function(model) {
  * @param {Boolean} like 是否like匹配
  * @return {Promise|Array} 查询结果
  */
-Sql.prototype.getObj = async function(query, sort, view, like = false) {
+Sql.prototype.getObj = async function(query, sort, view, like) {
 	this.page = 1;
 	this.size = 1;
 	var key = this.key;
@@ -841,6 +895,9 @@ Sql.prototype.getObj = async function(query, sort, view, like = false) {
 			view += "," + this.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

@@ -1,47 +1,47 @@
 const Mysql = require('./index.js').Mysql;
 
-var sql = new Mysql();
-sql.setConfig({
-	multipleStatements: true
-});
-sql.open();
-
-// var tpl = {
-// 	"query": {
-// 		"state_min": "`state` >= '{0}'",
-// 		"state_max": "`state` <= '{0}'",
-// 		"vip_min": "`vip` >= '{0}'",
-// 		"vip_max": "`vip` <= '{0}'",
-// 		"gm_min": "`gm` >= '{0}'",
-// 		"gm_max": "`gm` <= '{0}'",
-// 		"mc_min": "`mc` >= '{0}'",
-// 		"mc_max": "`mc` <= '{0}'",
-// 		"create_time_min": "`create_time` >= '{0}'",
-// 		"create_time_max": "`create_time` <= '{0}'",
-// 		"login_time_min": "`login_time` >= '{0}'",
-// 		"login_time_max": "`login_time` <= '{0}'",
-// 		"salt": "`salt` like '%{0}%'",
-// 		"invite_code": "`invite_code` like '%{0}%'",
-// 		"phone": "`phone` like '%{0}%'",
-// 		"username": "`username` like '%{0}%'",
-// 		"nickname": "`nickname` like '%{0}%'",
-// 		"password": "`password` like '%{0}%'",
-// 		"email": "`email` like '%{0}%'",
-// 		"user_group": "`user_group` like '%{0}%'",
-// 		"user_admin": "`user_admin` like '%{0}%'",
-// 		"login_ip": "`login_ip` like '%{0}%'",
-// 		"signature": "`signature` like '%{0}%'",
-// 		"avatar": "`avatar` like '%{0}%'",
-// 		"friends": "`friends` like '%{0}%'",
-// 		"admin_group": "`admin_group` like '%{0}%'"
-// 	},
-// 	"update": {
-// 		"state_add": "`state` = `state` + '{0}'",
-// 		"vip_add": "`vip` = `vip` + '{0}'",
-// 		"gm_add": "`gm` = `gm` + '{0}'",
-// 		"mc_add": "`mc` = `mc` + '{0}'"
-// 	}
-// };
+// var sql = new Mysql();
+// sql.setConfig({
+// 	multipleStatements: true
+// });
+// sql.open();
+
+var tpl = {
+	"query": {
+		"state_min": "`state` >= '{0}'",
+		"state_max": "`state` <= '{0}'",
+		"vip_min": "`vip` >= '{0}'",
+		"vip_max": "`vip` <= '{0}'",
+		"gm_min": "`gm` >= '{0}'",
+		"gm_max": "`gm` <= '{0}'",
+		"mc_min": "`mc` >= '{0}'",
+		"mc_max": "`mc` <= '{0}'",
+		"create_time_min": "`create_time` >= '{0}'",
+		"create_time_max": "`create_time` <= '{0}'",
+		"login_time_min": "`login_time` >= '{0}'",
+		"login_time_max": "`login_time` <= '{0}'",
+		"salt": "`salt` like '%{0}%'",
+		"invite_code": "`invite_code` like '%{0}%'",
+		"phone": "`phone` like '%{0}%'",
+		"username": "`username` like '%{0}%'",
+		"nickname": "`nickname` like '%{0}%'",
+		"password": "`password` like '%{0}%'",
+		"email": "`email` like '%{0}%'",
+		"user_group": "`user_group` like '%{0}%'",
+		"user_admin": "`user_admin` like '%{0}%'",
+		"login_ip": "`login_ip` like '%{0}%'",
+		"signature": "`signature` like '%{0}%'",
+		"avatar": "`avatar` like '%{0}%'",
+		"friends": "`friends` like '%{0}%'",
+		"admin_group": "`admin_group` like '%{0}%'"
+	},
+	"update": {
+		"state_add": "`state` = `state` + '{0}'",
+		"vip_add": "`vip` = `vip` + '{0}'",
+		"gm_add": "`gm` = `gm` + '{0}'",
+		"mc_add": "`mc` = `mc` + '{0}'"
+	}
+};
 
 // // 测试模板修改
 // async function test_tpl_set() {
@@ -68,25 +68,28 @@ sql.open();
 // }
 // test_tpl_set();
 
-// // 测试模板查询
-// async function test_tpl_get() {
-// 	var sql = new Mysql();
-// 	sql.open();
-// 	db = sql.db();
-// 	var num = 0;
-// 	db.table = 'user_account';
-// 	var query = {
-// 		gm: 5,
-// 		username: 'ad%m'
-// 	};
-// 	db.page = 1;
-// 	db.size = 5;
-// 	var query_str = db.tpl_query(query, tpl.query);
-// 	ret = await db.getSql(query_str, "`user_id` desc", "*");
-// 	console.log('查询结果', ret);
-// 	console.log('SQL语句', db.sql);
-// }
-// test_tpl_get();
+// 测试模板查询
+async function test_tpl_get() {
+	var sql = new Mysql();
+	sql.open();
+	db = sql.db();
+	var num = 0;
+	db.table = 'user_account';
+	var query = {
+		gm_min: 2,
+		username: 'ad%m'
+	};
+	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);
+	
+	ret = await db.groupSumSql(query_str, "mc", "gm");
+	console.log('求和查询结果', ret);
+}
+test_tpl_get();
 
 // async function addField() {
 // 	var sql = new Mysql();
@@ -167,12 +170,18 @@ sql.open();
 // 		console.log("SQL：" + db.sql);
 // 	}
 
-// 	num = await db.field_add("note", 'text', null, false);
+// 	num = await db.field_add("note", 'text', '123123', false);
 // 	console.log("note结果：" + num);
 // 	if (num < 0) {
 // 		console.log("SQL：" + db.sql);
 // 	}
-
+	
+// 	num = await db.field_add("content", 'longtext', '123123', false);
+// 	console.log("content结果：" + num);
+// 	if (num < 0) {
+// 		console.log("SQL：" + db.sql);
+// 	}
+	
 // 	num = await db.field_add("cycle", 'time', null, true);
 // 	console.log("cycle结果：" + num);
 // 	if (num < 0) {
@@ -249,13 +258,13 @@ sql.open();
 // }
 
 // 测试获取字段
-async function test3(){
-	sql.config.log = true;
-	var db = sql.db();
-	var fields = await db.fields("cloud_user_flow");
-	console.log(fields);
-}
-test3();
+// async function test3(){
+// 	sql.config.log = true;
+// 	var db = sql.db();
+// 	var fields = await db.fields("cloud_user_flow");
+// 	console.log(fields);
+// }
+// test3();
 
 
 // 测试实例新对象获取