mm_mysql 1.6.4 → 1.6.8

package/db.js

@@ -8,23 +8,51 @@ class DB extends Sql {
 	/**
 	 * @description 数据库管理器
 	 * @param {String} database 数据库名称
-	 * @param {Object} run 查询函数
-	 * @param {Object} exec 更改函数
 	 */
-	constructor(database, run, exec) {
-		super(run, exec);
-
-		// 数据库名
-		this.database = database;
-
+	constructor(mysql) {
+		super(mysql.run, mysql.exec);
 		// 事务中
 		this.task = 0;
 
 		// 事务SQL
 		this.task_sql = "";
+
+		/**
+		 * 获取上级
+		 * @return {Object} 返回上级管理器
+		 */
+		this.parent = function() {
+			return mysql;
+		};
 	}
 }
 
+/**
+ * 获取数据库名
+ * @return {String} 数据库
+ */
+DB.prototype.database = function() {
+	return this.parent().config.database;
+};
+
+/**
+ * 构建新管理器
+ * @param {String} table 表名
+ * @param {String} key 键名
+ * @return {Object} 返回管理器
+ */
+DB.prototype.new = function(table, key) {
+	var db = this.parent().db();
+	db.table = table;
+	if (key) {
+		db.key = key;
+	} else {
+		var arr = table.split("_");
+		db.key = arr[arr.length - 1] + "_id";
+	}
+	return db;
+};
+
 /**
  * 事务开始
  */
@@ -64,7 +92,7 @@ DB.prototype.back = async function(identifier = "point_1") {
  */
 DB.prototype.tables = async function(table) {
 	var list = await this.run("show tables");
-	var key = 'Tables_in_' + this.database;
+	var key = 'Tables_in_' + this.database();
 	if (table) {
 		list = list.search(table, key);
 	}
@@ -83,7 +111,7 @@ DB.prototype.fields = async function(table, field_name) {
 	var field =
 		'COLUMN_NAME as `name`,ORDINAL_POSITION as `cid`,COLUMN_DEFAULT as `dflt_value`,IS_NULLABLE as `notnull`,COLUMN_TYPE as `type`,COLUMN_KEY as `pk`,EXTRA as `auto`,COLUMN_COMMENT as `note`';
 	var sql = "select " + field + " from information_schema.COLUMNS where `table_name` = '" + table +
-		"' and `table_schema` = '" + this.database + "'";
+		"' and `table_schema` = '" + this.database() + "'";
 	if (field_name) {
 		sql += " AND COLUMN_NAME='" + field_name + "'";
 	}
@@ -193,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) {
@@ -270,7 +305,7 @@ DB.prototype.clearTable = async function(reset = true, table = '') {
 DB.prototype.field_add = async function(field, type, value, not_null, auto, isKey) {
 	var sql =
 		"SELECT COUNT(*) as `count` FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='{0}' AND table_name='{1}' AND COLUMN_NAME='{2}'";
-	sql = sql.replace('{0}', this.database).replace('{1}', this.table).replace('{2}', field);
+	sql = sql.replace('{0}', this.database()).replace('{1}', this.table).replace('{2}', field);
 	var arr = await this.run(sql);
 	if (arr && arr.length > 0) {
 		if (arr[0].count == 0) {
@@ -302,7 +337,7 @@ DB.prototype.field_add = async function(field, type, value, not_null, auto, isKe
 DB.prototype.field_set = async function(field, type, value, not_null, auto, isKey, new_name) {
 	var sql =
 		"SELECT COUNT(*) as `count` FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='{0}' AND table_name='{1}' AND COLUMN_NAME='{2}'";
-	sql = sql.replace('{0}', this.database).replace('{1}', this.table).replace('{2}', field);
+	sql = sql.replace('{0}', this.database()).replace('{1}', this.table).replace('{2}', field);
 	var arr = await this.run(sql);
 	if (arr && arr.length > 0) {
 		if (arr[0].count == 0) {
@@ -312,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) {
@@ -337,7 +372,7 @@ DB.prototype.field_set = async function(field, type, value, not_null, auto, isKe
 DB.prototype.field_del = async function(field) {
 	var sql =
 		"SELECT COUNT(*) as `count` FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='{0}' AND table_name='{1}' AND COLUMN_NAME='{2}'";
-	sql = sql.replace('{0}', this.database).replace('{1}', this.table).replace('{2}', field);
+	sql = sql.replace('{0}', this.database()).replace('{1}', this.table).replace('{2}', field);
 	var arr = await this.run(sql);
 	if (arr && arr.length > 0) {
 		if (arr[0].count > 0) {

package/index.js

@@ -198,17 +198,11 @@ class Mysql {
 			});
 		};
 
-		var _this = this;
-
 		/**
 		 * @description 获取数据库管理器
 		 */
 		this.db = function() {
-			var db = new DB($this.config.database, $this.run, $this.exec);
-			db.parent = function() {
-				return _this;
-			}
-			return db;
+			return new DB($this);
 		};
 	}
 }

package/package.json

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

package/sql.js

@@ -400,23 +400,31 @@ Sql.prototype.toWhere = function(obj, like) {
 		for (var k in obj) {
 			var val = obj[k];
 			if (k.endWith('_min')) {
-				where += " and " + this.escapeId(k.replace('_min', '')) + ">=" + this.escape(val);
+				where += " and " + this.escapeId(k.replace('_min', '')) + " >= " + this.escape(val);
 			} else if (k.endWith('_max')) {
-				where += " and " + this.escapeId(k.replace('_max', '')) + "<=" + this.escape(val);
+				where += " and " + this.escapeId(k.replace('_max', '')) + " <= " + this.escape(val);
+			} else if (k.endWith('_not')) {
+				where += " and " + this.escapeId(k.replace('_not', '')) + " != " + this.escape(val);
+			} else if (k.endWith('_has')) {
+				where += " and " + this.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("'") + "%'"
 			} else {
-				where += " and " + this.escapeId(k) + "=" + val
+				where += " and " + this.escapeId(k) + " = " + val
 			}
 		}
 	} else {
 		for (var k in obj) {
 			var val = obj[k];
 			if (k.endWith('_min')) {
-				where += " and " + this.escapeId(k.replace('_min', '')) + ">=" + this.escape(val.replace('_min',
+				where += " and " + this.escapeId(k.replace('_min', '')) + " >= " + this.escape(val.replace('_min',
 					''));
 			} else if (k.endWith('_max')) {
-				where += " and " + this.escapeId(k.replace('_max', '')) + "<=" + this.escape(val);
+				where += " and " + this.escapeId(k.replace('_max', '')) + " <= " + this.escape(val);
+			} else if (k.endWith('_not')) {
+				where += " and " + this.escapeId(k.replace('_not', '')) + " != " + this.escape(val);
+			} else if (k.endWith('_has')) {
+				where += " and " + this.escapeId(k.replace('_has', '')) + " in (" + val.replace(/`/gi, "") + ")";
 			} else {
 				where += " and " + this.escapeId(k) + "=" + this.escape(val);
 			}
@@ -433,7 +441,16 @@ Sql.prototype.toWhere = function(obj, like) {
 Sql.prototype.toSet = function(obj) {
 	var set = "";
 	for (var k in obj) {
-		set += "," + this.escapeId(k) + "=" + this.escape(obj[k]);
+		var val = this.escape(obj[k]);
+		if (k.endWith('_add')) {
+			var k2 = this.escapeId(k.replace('_add', ''));
+			set += "," + k2 + " = " + k2 + " + " + val;
+		} else if (k.endWith('_del')) {
+			var k3 = this.escapeId(k.replace('_del', ''));
+			set += "," + k3 + " = " + k3 + " - " + val;
+		} else {
+			set += "," + this.escapeId(k) + " = " + val;
+		}
 	}
 	return set.replace(",", "");
 };

package/test.js

@@ -6,42 +6,42 @@ sql.setConfig({
 });
 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 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() {
@@ -88,111 +88,117 @@ var tpl = {
 // }
 // test_tpl_get();
 
-// async function addField() {
-// 	var sql = new Mysql();
-// 	sql.open();
-// 	db = sql.db();
-// 	var num = 0;
-// 	db.table = 'test';
-// 	// num = await db.field_del('set6');
-// 	// num = await db.field_add('set6', 'str');
-// 	var bl = await db.addTable('test', 'uid', 'int', true, '测试表');
-// 	console.log("创建表：" + num);
-// 	if (bl < 0) {
-// 		console.log("SQL：" + db.sql);
-// 	}
-// 	// num = await db.field_add("uid", 'int', 0, true, true, true);
-// 	// console.log("uid结果：" + num);
-// 	// if (num < 0) {
-// 	// 	console.log("SQL：" + db.sql);
-// 	// }
-
-// 	num = await db.field_add("name", 'varchar(18)', '', true);
-// 	console.log("name结果：" + num);
-// 	if (num < 0) {
-// 		console.log("SQL：" + db.sql);
-// 	}
-
-// 	num = await db.field_add("username", 'varchar(18)', '', true);
-// 	console.log("username结果：" + num);
-// 	if (num < 0) {
-// 		console.log("SQL：" + db.sql);
-// 	}
+async function addField() {
+	var sql = new Mysql();
+	sql.open();
+	db = sql.db();
+	var num = 0;
+	db.table = 'test';
+	// num = await db.field_del('set6');
+	// num = await db.field_add('set6', 'str');
+	var bl = await db.addTable('test', 'uid', 'int', true, '测试表');
+	console.log("创建表：" + num);
+	if (bl < 0) {
+		console.log("SQL：" + db.sql);
+	}
+	// num = await db.field_add("uid", 'int', 0, true, true, true);
+	// console.log("uid结果：" + num);
+	// if (num < 0) {
+	// 	console.log("SQL：" + db.sql);
+	// }
+
+	num = await db.field_add("name", 'varchar(18)', '', true);
+	console.log("name结果：" + num);
+	if (num < 0) {
+		console.log("SQL：" + db.sql);
+	}
 
-// 	num = await db.field_add("password", 'string', '', true);
-// 	console.log("password结果：" + num);
-// 	if (num < 0) {
-// 		console.log("SQL：" + db.sql);
-// 	}
+	num = await db.field_add("username", 'varchar(18)', '', true);
+	console.log("username结果：" + num);
+	if (num < 0) {
+		console.log("SQL：" + db.sql);
+	}
 
-// 	num = await db.field_add("email", 'varchar', null);
-// 	console.log("email结果：" + num);
-// 	if (num < 0) {
-// 		console.log("SQL：" + db.sql);
-// 	}
+	num = await db.field_add("password", 'string', '', true);
+	console.log("password结果：" + num);
+	if (num < 0) {
+		console.log("SQL：" + db.sql);
+	}
 
-// 	num = await db.field_add("age", 'smallint', 0);
-// 	console.log("age结果：" + num);
-// 	if (num < 0) {
-// 		console.log("SQL：" + db.sql);
-// 	}
+	num = await db.field_add("email", 'varchar', null);
+	console.log("email结果：" + num);
+	if (num < 0) {
+		console.log("SQL：" + db.sql);
+	}
 
-// 	num = await db.field_add("sex", 'tinyint', 0);
-// 	console.log("sex结果：" + num);
-// 	if (num < 0) {
-// 		console.log("SQL：" + db.sql);
-// 	}
+	num = await db.field_add("age", 'smallint', 0);
+	console.log("age结果：" + num);
+	if (num < 0) {
+		console.log("SQL：" + db.sql);
+	}
 
-// 	num = await db.field_add("create_time", 'timestamp', null, true, true);
-// 	console.log("create_time结果：" + num);
-// 	if (num < 0) {
-// 		console.log("SQL：" + db.sql);
-// 	}
+	num = await db.field_add("sex", 'tinyint', 0);
+	console.log("sex结果：" + num);
+	if (num < 0) {
+		console.log("SQL：" + db.sql);
+	}
 
-// 	num = await db.field_add("update_time", 'timestamp', null, true, true);
-// 	console.log("update_time结果：" + num);
-// 	if (num < 0) {
-// 		console.log("SQL：" + db.sql);
-// 	}
+	num = await db.field_add("create_time", 'timestamp', null, true, true);
+	console.log("create_time结果：" + num);
+	if (num < 0) {
+		console.log("SQL：" + db.sql);
+	}
 
-// 	num = await db.field_add("last_time", 'timestamp');
-// 	console.log("last_time结果：" + num);
-// 	if (num < 0) {
-// 		console.log("SQL：" + db.sql);
-// 	}
+	num = await db.field_add("update_time", 'timestamp', null, true, true);
+	console.log("update_time结果：" + num);
+	if (num < 0) {
+		console.log("SQL：" + db.sql);
+	}
 
-// 	num = await db.field_add("birthday", 'date', '2020-06-28', true);
-// 	console.log("birthday结果：" + num);
-// 	if (num < 0) {
-// 		console.log("SQL：" + db.sql);
-// 	}
+	num = await db.field_add("last_time", 'timestamp');
+	console.log("last_time结果：" + num);
+	if (num < 0) {
+		console.log("SQL：" + db.sql);
+	}
 
-// 	num = await db.field_add("note", 'text', null, false);
-// 	console.log("note结果：" + num);
-// 	if (num < 0) {
-// 		console.log("SQL：" + db.sql);
-// 	}
+	num = await db.field_add("birthday", 'date', '2020-06-28', true);
+	console.log("birthday结果：" + 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) {
-// 		console.log("SQL：" + db.sql);
-// 	}
+	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) {
+		console.log("SQL：" + db.sql);
+	}
 
-// 	num = await db.field_add("money", 'double', 0);
-// 	console.log("money结果：" + num);
-// 	if (num < 0) {
-// 		console.log("SQL：" + db.sql);
-// 	}
+	num = await db.field_add("money", 'double', 0);
+	console.log("money结果：" + num);
+	if (num < 0) {
+		console.log("SQL：" + db.sql);
+	}
 
-// 	num = await db.field_add("like", 'string', '篮球 足球 乒乓球');
-// 	console.log("like结果：" + num);
-// 	if (num < 0) {
-// 		console.log("SQL：" + db.sql);
-// 	}
-// }
+	num = await db.field_add("like", 'string', '篮球 足球 乒乓球');
+	console.log("like结果：" + num);
+	if (num < 0) {
+		console.log("SQL：" + db.sql);
+	}
+}
 
-// addField();
+addField();
 
 
 // async function test() {
@@ -234,48 +240,83 @@ var tpl = {
 // 	var sql2 = db.parent();
 // 	// 取用户相关模型
 // 	var dbs = await sql2.dbs("user_id", 1, true, "user_account", "user_info", "service_member");
-	
+
 // 	var user = dbs.model;
 // 	// console.log(user);
-	
+
 // 	user.member.name = "美白";
 // 	// 合并属性
 // 	var u = dbs.merge();
 // 	// console.log(u);
 // 	u.age = 18;
 // 	u.name = "芬芬";
-	
+
 // 	// console.log(user);
 // }
 
-
-// 事务
-async function test() {
+// 测试获取字段
+async function test3(){
 	sql.config.log = true;
 	var db = sql.db();
-	// var db2 = sql.db();
-	await db.start();
-	console.log(db.task);
-	db.table = "cloud_user_flow";
-	var te = await db.add({
-		user_id: 1
-	});
-	var user = await db.getObj({
-		user_id: 1
-	});
-	var te1 = await db.add({
-		user_id1: 3
-	});
-	// db2.table = "cloud_user_flow";
-	// db2.add({
-	// 	user_id: 1,
-	// 	note: "哈哈"
-	// });
-	// console.log(user);
-	await db.commit();
-	console.log(db.sql);
-	await db.back();
+	var fields = await db.fields("cloud_user_flow");
+	console.log(fields);
 }
+test3();
+
+
+// 测试实例新对象获取
+// async function test3(){
+// 	sql.config.log = true;
+// 	var db = sql.db();
+// 	var db2 = db.new("cloud_user_flow");
+// 	var list = await db2.get();
+// 	console.log(list);
+// }
+// test3();
+
+// 事务
+// async function test() {
+// 	sql.config.log = true;
+// 	var db = sql.db();
+// 	// var db2 = sql.db();
+// 	// await db.start();
+// 	// console.log(db.task);
+// 	db.table = "cloud_user_flow";
+// 	// var te = await db.add({
+// 	// 	user_id: 1
+// 	// });
+// 	// var user = await db.getObj({
+// 	// 	user_id: 1
+// 	// });
+// 	// var te1 = await db.add({
+// 	// 	user_id1: 3
+// 	// });
+
+// 	var bl = await db.set({
+// 		user_id_not: "1"
+// 	}, {
+// 		amount_del: 5,
+// 		balance_add: 1000,
+// 		state: 2
+// 	});
+
+// 	// db.table = "user_account";
+// 	// db.size = 0;
+// 	// var list_user = await db.get({
+// 	// 	user_id_has: "1,45,46,47,48"
+// 	// });
+// 	// console.log(list_user);
+
+// 	// db2.table = "cloud_user_flow";
+// 	// db2.add({
+// 	// 	user_id: 1,
+// 	// 	note: "哈哈"
+// 	// });
+// 	// console.log(user);
+// 	// await db.commit();
+// 	console.log(db.sql);
+// 	// await db.back();
+// }
 
 
 // // 算法排序
@@ -283,7 +324,7 @@ async function test() {
 // 	var db = sql.db();
 // 	// db.table = "user_account"
 // 	// var ret = await db.get({}, "score desc", "username,vip+gm*3 score");
-	
+
 // 	db.table = "service_order";
 // 	db.page = 1;
 // 	db.size = 10;
@@ -293,7 +334,7 @@ async function test() {
 // 		time_create_min: "2021-07-26 00:00:00",
 // 		time_create_max: "2021-07-27 00:00:00",
 // 	}, "user_id", "score");
-	
+
 // 	console.log(ret);
 // 	console.log(db.sql);
 // 	console.log(db.error);
@@ -346,7 +387,7 @@ async function test() {
 // 	// console.log("删除：" + JSON.stringify(ret), db.error);
 // }
 
-test();
+// test();
 
 
 
@@ -588,4 +629,4 @@ test();
 // 	console.log(db.sql);
 // }
 
-// test_model();
+// test_model();