mm_mysql 1.9.1 → 1.9.3

package/index.js

@@ -11,6 +11,9 @@ const {
 } = require('./db');
 
 const Link_model = require('./link_model');
+const {
+	table
+} = require('console');
 
 var pool = {};
 
@@ -87,6 +90,10 @@ class Mysql {
 				$.log.debug("SQL：", sql);
 			}
 
+			if (!$this.conn) {
+				$this.open();
+			}
+
 			// 返回一个 Promise
 			return new Promise((resolve, reject) => {
 				$this.conn.getConnection(function(err, db) {
@@ -151,6 +158,11 @@ class Mysql {
 			if ($this.config.log) {
 				$.log.debug("SQL：", sql);
 			}
+
+			if (!$this.conn) {
+				$this.open();
+			}
+
 			// 返回一个 Promise
 			return new Promise((resolve, reject) => {
 				$this.conn.getConnection(function(err, db) {
@@ -216,66 +228,161 @@ class Mysql {
 		this.db = function() {
 			return new DB($this);
 		};
+	}
+}
 
-		/**
-		 * 
-		 * @param {Object} file sql文件
-		 * @param {Function} func 回调函数
-		 * @return {Promise} 异步构造器, 当await时返回执行结果
-		 */
-		this.load = async function(file, func) {
-			var count = 0;
-			var progress = 0;
-			var errors = [];
-			var index = 0;
-			try {
-				var data = file.loadText();
-				// 将SQL文件内容分割成单独的语句
-				const arr = data.split(';\r\n');
-				count = arr.length;
-				for (var i = 0; i < arr.length; i++) {
-					var sql_str = arr[i].trim();
-					var bl;
-					if (sql_str !== '') {
-						await this.run(sql_str + ";");
-						if (this.error) {
-							errors.push({
-								sql_str: sql_str.slice(0, 512),
-								error: this.error
-							});
-							bl = false;
-							// 如果数据库链接失败(密码错误或无法连接)，则退出循环
-							if (this.error.code == 1045 || this.error.code == 2003) {
-								break;
-							}
-						} else {
-							bl = true;
-						}
+/**
+ * 导入数据库
+ * @param {Object} file sql文件
+ * @param {Function} func 回调函数
+ * @return {Promise} 异步构造器, 当await时返回执行结果
+ */
+Mysql.prototype.load = async function(file, func) {
+	var count = 0;
+	var progress = 0;
+	var errors = [];
+	var index = 0;
+	try {
+		var data = file.loadText();
+		// 将SQL文件内容分割成单独的语句
+		const arr = data.split(';\r\n');
+		count = arr.length;
+		for (var i = 0; i < arr.length; i++) {
+			var sql_str = arr[i].trim();
+			if (sql_str !== '') {
+				await this.run(sql_str + ";");
+				if (this.error) {
+					errors.push({
+						sql_str: sql_str.slice(0, 512),
+						error: this.error
+					});
+					// 如果数据库链接失败(密码错误或无法连接)，则退出循环
+					if (this.error.code == 1045 || this.error.code == 2003) {
+						break;
 					}
-					var p = i / arr.length;
-					progress = Math.ceil(p * 100);
-					index = i;
-					if (func) {
-						func(progress, index, bl, this.error, sql_str);
+				}
+			}
+			var p = i / arr.length;
+			progress = Math.ceil(p * 100);
+			index = i;
+			if (func) {
+				func(progress, index, this.error, sql_str);
+			}
+		}
+	} catch (err) {
+		$.log.error("导入SQL文件失败！", err);
+	}
+	return {
+		index,
+		count,
+		progress,
+		errors
+	}
+};
+
+/**
+ * 保存数据库为文件
+ * @param {String} file 文件对象
+ * @param {Function} func 回调函数
+ * @return {Promise} 异步构造器, 当await时返回执行结果
+ */
+Mysql.prototype.save = async function(file, func, tables = []) {
+	const fs = require('fs');
+	const stream = fs.createWriteStream(file);
+	let count = 0;
+	let progress = 0;
+	let errors = [];
+	let index = 0;
+	let tableCount = 0;
+
+	try {
+		// 开始导出数据库
+		stream.write('SET FOREIGN_KEY_CHECKS = 0;\r\n\r\n');
+		count++;
+
+		if (!tables.length) {
+			// 获取所有表
+			var tbs = await this.run('SHOW TABLES');
+			tables = tbs.map((item) => {
+				return item[Object.keys(item)[0]];
+			});
+		}
+
+		tableCount = tables.length;
+		console.log("tables", tables);
+		for (var i = 0; i < tables.length; i++) {
+			var tableName = tables[i];
+			try {
+				// 导出表结构
+				const createTable = await this.run(`SHOW CREATE TABLE ${tableName}`);
+				stream.write(`-- 表结构: ${tableName}\r\n`);
+				stream.write(`DROP TABLE IF EXISTS \`${tableName}\`;\r\n`);
+				count++;
+				stream.write(`${createTable[0]['Create Table']};\r\n\r\n`);
+				count++;
+				// 导出表数据
+				const rows = await this.run(`SELECT * FROM ${tableName}`);
+				if (rows.length > 0) {
+					stream.write(`-- 表数据: ${tableName}\r\n`);
+					for (const row of rows) {
+						const rowValues = Object.values(row)
+							.map(value => {
+								if (value === null) return 'NULL';
+								if (typeof value === 'boolean') return value ? 1 : 0;
+								if (typeof value === 'number') return value;
+								if (value instanceof Date) {
+									return "'" + value.toStr('yyyy-MM-dd hh:mm:ss') + "'";
+								}
+								// 处理字符串，转义特殊字符
+								return "'" + value.toString()
+									.replace(/[\\']/g, '\\$&')
+									.replace(/\n/g, '\\n')
+									.replace(/\r/g, '\\r')
+									.replace(/\t/g, '\\t')
+									.replace(/\u0000/g, '\\0') + "'";
+							})
+							.join(',');
+						stream.write(`INSERT INTO ${tableName} VALUES (${rowValues});\r\n`);
+						count++;
 					}
+					stream.write('\r\n');
 				}
 			} catch (err) {
-				$.log.error("导入SQL文件失败！", err);
+				errors.push({
+					table: tableName,
+					error: err.message
+				});
 			}
-			return {
-				index,
-				count,
-				progress,
-				errors
+
+			index++;
+			progress = Math.ceil((index / tableCount) * 100);
+			if (func) {
+				func(progress, index, this.error, tableName);
 			}
 		}
+
+		// 完成导出
+		stream.write('SET FOREIGN_KEY_CHECKS = 1;\r\n');
+		count++;
+		stream.end();
+	} catch (err) {
+		$.log.error("导出SQL文件失败！", err);
+		stream.end();
 	}
-}
+
+	return {
+		tableCount,
+		index,
+		count,
+		progress,
+		errors
+	}
+};
 
 /**
  * 获取数据库管理器
  * @param {String} key 主键
- * @param {String|Number} value 对象值 
+ * @param {String|Number} value 对象值
  * @param {Boolean} clear_prefix 清除前缀
  * @param {Array} arr_table 关联的数据表
  * @return {Object} 管理模型

package/package.json

@@ -1,21 +1,19 @@
-{
+{
 	"name": "mm_mysql",
-	"version": "1.9.1",
+	"version": "1.9.3",
 	"description": "这是超级美眉mysql帮助函数模块，用于便捷操作mysql，使用await方式，可以避免嵌套函数",
 	"main": "index.js",
 	"dependencies": {
-		"mm_logs": "^1.1.6",
-		"mysql": "^2.18.1"
+		"mm_expand": "^1.8.0",
+		"mm_logs": "^1.1.7"
 	},
 	"scripts": {
 		"test": "node test.js",
 		"dev": "nodemon test.js"
 	},
-	"author": "邱文武",
-	"license": "ISC",
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/qiuwenwu/mm_mysql.git"
+		"url": "https://gitee.com/qiuwenwu91/mm_mysql.git"
 	},
 	"keywords": [
 		"mysql",
@@ -30,8 +28,6 @@
 		"run",
 		"exec"
 	],
-	"bugs": {
-		"url": "https://github.com/qiuwenwu/mm_mysql/issues"
-	},
-	"homepage": "https://github.com/qiuwenwu/mm_mysql#readme"
-}
+	"author": "qww",
+	"license": "ISC"
+}

package/test.js

@@ -13,13 +13,40 @@ async function test() {
 		password: "Asd159357",
 		multipleStatements: true
 	});
-	await sql.open();
-	var file = "./data.sql".fullname(__dirname);
-	var ret = await sql.load(file, function(progress, index, bl, error, sql_str) {
-		console.log(progress, index, bl, error, sql_str);
-	});
+	// await sql.open();
+
+	// db = sql.db();
+	// db.table = 'user_account';
+
+	// var obj = await db.getObj();
+	// console.log(obj);
+
+	// // 导入
+	// var ret = await sql.load("./data.sql".fullname(__dirname), function(progress, index, error, sql_str) {
+	// 	console.log("导入", progress, index, error, sql_str);
+	// });
+	// console.log("导入结果", ret);
+
+	// 导出指定表'user_account', 'user_info'
+	// var ret2 = await sql.save("./bat.sql".fullname(__dirname), function(progress, index, error, sql_str) {
+	// 	console.log("导出", progress, index, error, sql_str);
+	// }, ['user_account', 'user_info']);
+	// console.log("导出结果", ret2);
+
+	// // 导出
+	// var ret2 = await sql.save("./bat.sql".fullname(__dirname), function(progress, index, error, sql_str) {
+	// 	// console.log("导出", progress, index, error, sql_str);
+	// });
+	// console.log("导出结果", ret2);
+
+	// // 导入
+	// var ret = await sql.load("./bat.sql".fullname(__dirname), function(progress, index, error, sql_str) {
+	// 	// console.log("导入", progress, index, error, sql_str);
+	// });
+	// console.log("导入结果", ret);
+
 	sql.close();
-	console.log("执行结果", ret);
+
 }
 test();