mm_sqlite 1.0.5 → 1.0.6

package/db.js

@@ -8,38 +8,86 @@ class DB extends Sql {
 	/**
 	 * @description 数据库管理器
 	 * @param {String} database 数据库名称
-	 * @param {Object} run 查询函数
-	 * @param {Object} exec 更改函数
 	 */
-	constructor(database, run, exec) {
-		super(run, exec);
+	constructor(sqlite) {
+		super(sqlite.run, sqlite.exec);
+		// 事务中
+		this.task = 0;
 
-		// 数据库名
-		this.database = database;
+		// 事务SQL
+		this.task_sql = "";
+
+		/**
+		 * 获取上级
+		 * @return {Object} 返回上级管理器
+		 */
+		this.parent = function() {
+			return sqlite;
+		};
 	}
 }
 
 /**
- * @description 批量添加数据
- * @param {Array} list 添加的对象组
- * @property {Promise|Number} 返回成功数 
+ * 获取数据库名
+ * @return {String} 数据库
  */
-DB.prototype.addList = async function(list) {
-	var bl_num = 0;
-	var len = list.length;
-	for (var i = 0; i < len; i++) {
-		var bl = await this.addObj(list[i]);
-		if(bl)
-		{
-			bl_num += 1;
-		}
+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 bl_num;
+	return db;
+};
+
+/**
+ * 事务开始
+ */
+DB.prototype.start = async function(identifier = "point_1") {
+	this.task = 1;
+	return await this.exec("SET AUTOCOMMIT=0;BEGIN;");
+};
+
+/**
+ * 提交
+ */
+DB.prototype.commit = async function() {
+	this.task = 2;
+	return this.exec("COMMIT;");
+};
+
+/**
+ * 事务结束
+ */
+DB.prototype.end = async function() {
+	this.task = 3;
+};
+
+/**
+ * 滚回
+ */
+DB.prototype.back = async function(identifier = "point_1") {
+	this.task = 3;
+	await this.exec("ROLLBACK;");
+	return this.exec("SET AUTOCOMMIT=1;");
 };
 
 /**
  * @description 获取所有表名
- * @param {String} table 表名关键词
+ * @param {String} table 表名关键词, 可以 *table*包含、*table后缀、table*前缀 查询
  * @return {Promise|Array} 表名数组
  */
 DB.prototype.tables = async function(table) {
@@ -55,7 +103,7 @@ DB.prototype.tables = async function(table) {
  * @param {String} table 表名
  * @return {Promise|Array} 字段信息列表
  */
-DB.prototype.fields = async function(table) {
+DB.prototype.fields = async function(table, field_name) {
 	if (!table) {
 		table = this.table;
 	}
@@ -71,134 +119,336 @@ DB.prototype.fields = async function(table) {
 
 /**
  * @description 设置类型
- * @param {String} type 类型名, 常用类型 mediumint, int, varchar
- * @param {Boolean} auto  是否自增字段 (默认为自增字段)
- * @return {String} 返回类型名
+ * @param {String} field 字段名
+ * @param {String} type 类型名，常用类型 mediumint, int, varchar, datetime
+ * @param {String} value 默认值
+ * @param {Boolean} not_null 是否非空字段 true为非空，false为可空
+ * @param {Boolean} auto 自动
+ * @return {String} 返回最终类型
  */
-DB.prototype.setType = function(type, auto) {
+DB.prototype.setType = function(field, type, value, not_null, auto) {
 	if (!type) {
-		type = 'int';
+		type = 'integer';
 	}
 	switch (type) {
 		case "str":
 		case "varchar":
 		case "string":
-			type = "varchar(255) NOT NULL";
+			type = "varchar(255)";
+			if (not_null) {
+				type += " NOT NULL";
+			}
+			if (value) {
+				type += " DEFAULT '" + value + "'";
+			} else {
+				type += " DEFAULT ''";
+			}
 			break;
-		case "int":
 		case "number":
-			type = "integer NOT NULL";
-			if (auto || auto === undefined) {
+			type = "integer(11) NOT NULL";
+			if (auto) {
 				type += " autoincrement";
+			} else if (value) {
+				type += " DEFAULT " + value;
+			} else {
+				type += " DEFAULT 0";
 			}
 			break;
 		case "bool":
 		case "tinyint":
-			type = "tinyint(1) NOT NULL";
+			type = "tinyint(1) UNSIGNED NOT NULL";
+			if (value) {
+				type += " DEFAULT " + value;
+			} else {
+				type += " DEFAULT 0";
+			}
 			break;
-		default:
+		case "datetime":
+			if (!value) {
+				value = "1970-01-01 00:00:00";
+			}
+			type += " DEFAULT '" + value + "'";
+			break;
+		case "timestamp":
+			if (auto) {
+				if (field.indexOf('update') !== -1 || field.indexOf('last') !== -1) {
+					type += " DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP";
+				} else {
+					type += " DEFAULT CURRENT_TIMESTAMP";
+				}
+			} else {
+				type += " DEFAULT CURRENT_TIMESTAMP";
+			}
+			break;
+		case "date":
+			if (!value) {
+				value = "1970-01-01";
+			}
+			type += " NOT NULL DEFAULT '" + value + "'";
+			break;
+		case "time":
+			if (!value) {
+				value = "00:00:00";
+			}
+			type += " NOT NULL DEFAULT '" + value + "'";
+			break;
+		case "double":
+			if (type == "double") {
+				type = "double(10, 2)"
+			}
+			type += " NOT NULL";
+			if (value) {
+				type += " DEFAULT '" + value + "'";
+			} else {
+				type += " DEFAULT 0";
+			}
+			break;
+		case "float":
+			if (type == "float") {
+				type = "float(17, 8)"
+			}
 			type += " NOT NULL";
-			if (type.indexOf('int') !== -1) {
-				if (auto || auto === undefined) {
+			if (value) {
+				type += " DEFAULT '" + value + "'";
+			} else {
+				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) {
+				if (not_null) {
+					type += " NOT NULL"
+				}
+				if (value) {
+					type += " DEFAULT '" + value + "'";
+				} else {
+					type += " DEFAULT ''";
+				}
+			} else {
+				type += " UNSIGNED NOT NULL";
+				if (auto) {
 					type += " autoincrement";
+				} else {
+					if (value) {
+						type += " DEFAULT '" + value + "'";
+					} else {
+						type += " DEFAULT 0";
+					}
 				}
 			}
 			break;
 	}
 	return type;
-}
+};
 
 /**
  * @description 创建数据表
  * @param {String} table 表名
  * @param {String} field 主键字段名
- * @param {String} type  类型名 (string) 常用类型 mediumint, int, varchar
- * @param {Boolean} auto 是否自增字段, 默认为自增字段 
- * @return {Promise|Boolean} 执行结果
+ * @param {String} type  类型名，常用类型 mediumint, int, varchar
+ * @param {Boolean} auto 是否自增字段, 默认为自增字段
+ * @param {String} commit 注释
+ * @return {Promise|Number} 创建成功返回1，失败返回0
  */
-DB.prototype.addTable = async function(table, field, type, auto) {
+DB.prototype.addTable = async function(table, field, type, auto, commit = '') {
 	if (!field) {
 		field = "id";
 	}
-	var te = this.setType(type, auto).replace('NULL', 'NULL PRIMARY KEY');
-	var sql = "CREATE TABLE IF NOT EXISTS `{0}` (`{1}` {2});".replace('{0}', table).replace('{1}',
-		field).replace('{2}', te);
-	return await this.exec(sql);
+	var sql = "CREATE TABLE IF NOT EXISTS `{0}` (`{1}` {2})".replace('{0}', table).replace(
+		'{1}', field).replace('{2}', this.setType(field, type, null, true, auto) + ' PRIMARY KEY');
+	if (commit) {
+		sql += " COMMENT = '" + commit + "';"
+	} else {
+		sql += ";"
+	}
+	var bl = await this.exec(sql);
+	return bl;
 };
 
 /**
- * @description 创建数据表
+ * @description 清空数据表
+ * @param {Boolean} reset 是否重置自增ID
+ * @return {Promise|Number} 清空成功返回1，失败返回0
+ */
+DB.prototype.clearTable = async function(reset = true, table = '') {
+	var sql = reset ? "TRUNCATE table `{0}`;" : "DELETE FROM `{0}`";
+	var bl = await this.exec(sql.replace('{0}', table || this.table));
+	return bl;
+};
+
+/**
+ * @description 添加字段
  * @param {String} field 字段名
- * @param {String} type  类型名 (string) 常用类型 mediumint, int, float, double, varchar, tinyint, text, date, datetime, time
- * @param {String|Number} isKey 默认值
+ * @param {String} type 类型名，常用类型 mediumint, int, float, double, varchar, tinyint, text, date, datetime, time, timestamp
+ * @param {String|Number} value 默认值
+ * @param {Boolean} not_null 是否非空字段 true为非空，false为可空
+ * @param {Boolean} auto 是否自动（如果为数字类型则自增增段，如果为时间类型则默认事件）
  * @param {Boolean} isKey 是否主键
- * @return {Promise|Boolean} 添加成功返回true, 失败返回false
+ * @return {Promise|Number} 添加成功返回1，失败返回0
  */
-DB.prototype.field_add = async function(field, type, value, isKey) {
+DB.prototype.field_add = async function(field, type, value, not_null, auto, isKey) {
 	var sql =
-		"select count(*) as `count` from sqlite_master where `type` = 'table' and `name` = '{0}' and `sql` like '%`{1}`%'";
-	sql = sql.replace('{0}', this.table).replace('{1}', field);
+		"select count(*) as `count` from sqlite_master where `type` = 'table' and `name` = '{1}' and `sql` like '%{2}%'";
+	sql = sql.replace('{1}', this.table).replace('{2}', field);
 	var arr = await this.run(sql);
 	if (arr && arr.length > 0) {
 		if (arr[0].count == 0) {
-			var type = this.setType(type, false);
-			if (value !== undefined) {
-				if (typeof(value) == 'string') {
-					type += " DEFAULT '" + value + "'";
-				} else {
-					type += " DEFAULT " + value;
-				}
-			} else if (type.has('varchar') || type.has('text')) {
-				type = type.replace('NOT NULL', '');
-			} else if (type.has('dateTime')) {
-				type += " DEFAULT '1970-01-01 00:00:00'";
-			} else if (type.has('date')) {
-				type += " DEFAULT '1970-01-01'";
-			} else if (type.has('time')) {
-				type += " DEFAULT '00:00:00'";
-			} else {
-				type += " DEFAULT 0";
-			}
-			var sql = "ALTER Table `{0}` ADD `{1}` {2}".replace('{0}', this.table).replace('{1}', field).replace('{2}',
-				type);
+			var type = this.setType(field, type, value, not_null, auto);
+			var sql = "ALTER Table `{0}` ADD `{1}` {2}";
+			sql = sql.replace('{0}', this.table).replace('{1}', field).replace('{2}', type);
 			if (isKey) {
-				sql += ", ADD PRIMARY KEY (`{0}`)".replace('{0}', field);
+				sql += " , ADD PRIMARY KEY (`" + field + "`)";
+			} else {
+				sql += ";";
 			}
 			return await this.exec(sql);
 		}
 	}
-	return false;
+	return 0;
+};
+
+/**
+ * @description 修改字段
+ * @param {String} field 字段名
+ * @param {String} type 类型名，常用类型 mediumint, int, float, double, varchar, tinyint, text, date, datetime, time, timestamp
+ * @param {String|Number} value 默认值
+ * @param {Boolean} not_null 是否非空字段 true为非空，false为可空
+ * @param {Boolean} auto 是否自动（如果为数字类型则自增增段，如果为时间类型则默认事件）
+ * @param {Boolean} isKey 是否主键
+ * @param {String} new_name 新名称
+ * @return {Promise|Number} 修改成功返回1，失败返回0
+ */
+DB.prototype.field_set = async function(field, type, value, not_null, auto, isKey, new_name) {
+	var sql =
+		"select count(*) as `count` from sqlite_master where `type` = 'table' and `name` = '{1}' and `sql` like '%{2}%'";
+	sql = sql.replace('{1}', this.table).replace('{2}', field);
+	console.log("来", sql);
+	var arr = await this.run(sql);
+	if (arr && arr.length > 0) {
+		if (arr[0].count == 0) {
+			return 0;
+		}
+	}
+
+	var type = this.setType(field, type, value, not_null, auto);
+	if (type.has('text')) {
+		type = type.replace('NOT NULL', '').replace("DEFAULT ''", "");
+	}
+
+	if (!new_name) {
+		new_name = field;
+	}
+
+	sql = "ALTER TABLE `{0}` ADD COLUMN `{2}` {3}";
+	sql = sql.replace('{0}', this.table).replace('{2}', new_name).replace('{3}', type);
+	if (isKey) {
+		sql += ", DROP PRIMARY KEY, ADD PRIMARY KEY (" + new_name + ") USING BTREE;"
+	} else {
+		sql += ";";
+	}
+	await this.exec(sql);
+
+	sql = "UPDATE TABLE `{0}` SET `{2}` = `{1}`;";
+	sql = sql.replace('{0}', this.table).replace('{1}', field).replace('{2}', new_name);
+	var ret = await this.exec(sql);
+
+	if (field !== new_name) {
+		// sql = "ALTER TABLE `{0}` DROP COLUMN `{1}`;";
+		// sql = sql.replace('{0}', this.table).replace('{1}', field);
+		// ret = await this.exec(sql);
+		// console.log("来了3", this.sql);
+	}
+	return ret;
+	// sql = "ALTER TABLE `{0}` CHANGE COLUMN `{1}` `{2}` {3}";
+	// sql = sql.replace('{0}', this.table).replace('{1}', field).replace('{2}', new_name).replace('{3}', type);
+	// if (isKey) {
+	// 	sql += ", DROP PRIMARY KEY, ADD PRIMARY KEY (" + new_name + ") USING BTREE;"
+	// } else {
+	// 	sql += ";";
+	// }
+	// return await this.exec(sql);
 };
 
 /**
  * @description 删除字段
  * @param {String} field 字段名
+ * @return {Promise|Number} 删除成功返回1，失败返回0
  */
 DB.prototype.field_del = async function(field) {
-	var arr = await this.fields();
-	if (arr && arr.length > 0 && arr.has({
-			'name': field
-		})) {
-		var fields = ',' + arr.getArr('name').toStr(',') + ',';
-		fields = fields.replace(',' + field + ',', ',').trim(',');
-		await this.exec("drop table `mm_temp`");
-		var sql = "create table `mm_temp` as select {0} from `{1}` where 1 = 1;".replace('{0}', fields).replace('{1}',
-			this.table);
-		var bl = await this.exec(sql);
-		if (bl) {
-			bl = await this.exec("drop table `{0}`".replace('{0}', this.table));
-			if (bl) {
-				bl = await this.exec("alter table `mm_temp` rename to `{0}`;".replace('{0}', this.table));
-				if (bl) {
-					this.error = undefined;
-				}
-			}
-		} else {
+	var sql =
+		"select count(*) as `count` from sqlite_master where `type` = 'table' and `name` = '{1}' and `sql` like '%{2}%'";
+	sql = sql.replace('{1}', this.table).replace('{2}', field);
+	var arr = await this.run(sql);
+	if (arr && arr.length > 0) {
+		if (arr[0].count > 0) {
+			sql = "ALTER Table `{0}` rename to `{1}`;".replace('{0}', this.table).replace('{1}', field);
+			return await this.exec(sql);
+		}
+	}
+	return 0;
+};
 
+/**
+ * @description 拼接字段信息SQL
+ * @param {Object} fd 字段信息
+ * @return {String} sql语段
+ */
+DB.prototype.field_sql = function(fd) {
+	var sql = "`{0}`".replace('{0}', fd.name);
+	sql += " " + fd.type;
+	if (fd.notnull) {
+		sql += " NOT NULL";
+	}
+	if (fd.auto) {
+		if (fd.dflt_value) {
+			if (fd.dflt_value === '0000-00-00 00:00:00') {
+				fd.dflt_value = 'CURRENT_TIMESTAMP';
+			}
+			sql += " DEFAULT " + fd.dflt_value;
 		}
-		return bl;
+		sql += " " + fd.auto;
+	} else if (fd.dflt_value) {
+		if (fd.dflt_value === '0000-00-00 00:00:00') {
+			fd.dflt_value = '1970-01-01 00:00:00';
+		}
+		sql += " DEFAULT " + fd.dflt_value;
+	}
+	if (fd.note) {
+		sql += " COMMENT '" + fd.note + "'";
+	}
+	if (fd.pk) {
+		sql += " PRIMARY KEY";
+	}
+	return sql;
+};
+
+/**
+ * @description 修改字段名称
+ * @param {String} field 字段名
+ * @param {String} name 变更后名称
+ * @return {Promise|Number} 修改成功返回1，失败返回0
+ */
+DB.prototype.field_name = async function(field, name) {
+	var fields = await this.fields(this.table, field);
+	if (!fields) {
+		return -1;
+	}
+	if (fields.length === 0) {
+		return 0;
 	}
-	return false;
+	var sql_sub = this.field_sql(fields[0]);
+	sql_sub = sql_sub.replace("`" + field + "`", "`" + name + "`").replace(' PRIMARY KEY', '');
+	var sql = "alter table `{0}` change `{1}` " + sql_sub;
+	sql = sql.replace('{0}', this.table).replace('{1}', field);
+	return await this.exec(sql);
 };
 
-exports.DB = DB;
+exports.DB = DB;

package/index.js

@@ -4,6 +4,8 @@ const {
 	DB
 } = require('./db');
 
+const Link_model = require('./link_model');
+
 var pool = {};
 
 /// 数据库封装
@@ -59,8 +61,10 @@ class Sqlite {
 		 * @return {Promise|Array} 异步构造器, 当await时返回执行结果
 		 */
 		this.run = function(sql, val) {
+			sql = sql.replaceAll("&&", "AND").replaceAll("||", "OR").replaceAll("varchar", "text").replaceAll(" int", " integer");
 			var _this = this;
 			this.sql = sql;
+			
 			// 返回一个 Promise
 			return new Promise((resolve, reject) => {
 				$this.conn.all(sql, val, function(err, rows) {
@@ -70,15 +74,15 @@ class Sqlite {
 							code: err.errno,
 							message: $.info(err).between('Error: ', ']')
 						};
-						resolve(rows);
+						resolve(rows || []);
 					} else {
 						_this.error = undefined;
-						resolve(rows);
+						resolve(rows || []);
 					}
 				});
 			});
 		};
-
+		
 		/**
 		 * @description 增删改sql
 		 * @param {String} sql 查询参
@@ -86,6 +90,7 @@ class Sqlite {
 		 * @return {Promise|Array} 异步构造器, 当await时返回执行结果
 		 */
 		this.exec = function(sql) {
+			sql = sql.replaceAll("&&", "AND").replaceAll("||", "OR").replaceAll("varchar", "text").replaceAll(" int", " integer");
 			var _this = this;
 			this.sql = sql;
 			// 返回一个 Promise
@@ -105,12 +110,12 @@ class Sqlite {
 				});
 			});
 		};
-
+	
 		/**
 		 * @description 获取数据库管理器
 		 */
 		this.db = function() {
-			return new DB($this.config.database, $this.run, $this.exec);
+			return new DB($this);
 		};
 	}
 }
@@ -151,6 +156,7 @@ Sqlite.prototype.open = function() {
 	}
 	this.conn = pool[this.identifier];
 };
+
 /**
  * @description 关闭连接
  */
@@ -161,8 +167,31 @@ Sqlite.prototype.close = function() {
 	}
 };
 
-exports.Sqlite = Sqlite;
+/**
+ * 获取数据库管理器
+ * @param {String} key 主键
+ * @param {String|Number} value 对象值 
+ * @param {Boolean} clear_prefix 清除前缀
+ * @param {Array} arr_table 关联的数据表
+ * @return {Object} 管理模型
+ */
+Sqlite.prototype.dbs = async function(key, value, clear_prefix, ...arr_table) {
+	var lm = new Link_model({
+		key,
+		value,
+		clear_prefix
+	});
+	lm.sql = this;
+	for (var i = 0; i < arr_table.length; i++) {
+		await lm.add(arr_table[i]);
+	}
+	return lm;
+};
 
+/**
+ * @description 导出Sqlite帮助类
+ */
+exports.Sqlite = Sqlite;
 
 /**
  * @description sqlite连接池
@@ -170,8 +199,9 @@ exports.Sqlite = Sqlite;
 if (!$.pool.sqlite) {
 	$.pool.sqlite = {};
 }
+
 /**
- * @description sqlite管理器，用于创建缓存
+ * @description 缓存管理器，用于创建缓存
  * @param {String} scope 作用域
  * @param {String} dir 当前路径
  * @return {Object} 返回一个缓存类
@@ -189,6 +219,6 @@ function sqlite_admin(scope, dir) {
 }
 
 /**
- * @module 导出sqlite管理器
+ * @description 导出Sqlite管理函数
  */
 exports.sqlite_admin = sqlite_admin;