mm_mysql 1.9.9 → 2.0.1

package/index.js

@@ -94,7 +94,7 @@ class Mysql {
 			var list = [];
 			try {
 				// 关于连接池初始化，请参阅上文
-				conn = await $this.pool.getConnection();
+				conn = await $this.getConn();
 				const [rows] = await conn.query(sql, val);
 				// 查询解析时，连接会自动释放
 				list = rows;
@@ -118,7 +118,7 @@ class Mysql {
 		 */
 		this.exec = async function(sql, val) {
 			if (this.task) {
-				this.task_sql += sql + "\r\n";
+				this.task_sql += sql + "\n";
 				if (this.task === 1) {
 					return this.task_sql;
 				} else if (this.task === 2) {
@@ -138,7 +138,7 @@ class Mysql {
 			var conn;
 			var bl = -1;
 			try {
-				conn = await $this.pool.getConnection();
+				conn = await $this.getConn();
 				var [rows] = await conn.execute(sql, val);
 				if (rows.constructor == Array) {
 					if (rows.length > 0) {
@@ -188,6 +188,9 @@ class Mysql {
 Mysql.prototype.getConn = async function() {
 	let conn;
 	try {
+		if (!this.pool) {
+			await this.open();
+		}
 		conn = await this.pool.getConnection();
 	} catch (err) {
 		console.error('Connection failed - retrying: ' + err.message);
@@ -212,7 +215,7 @@ Mysql.prototype.load = async function(file, func) {
 	try {
 		var data = file.loadText();
 		// 将SQL文件内容分割成单独的语句
-		const arr = data.split(';\r\n');
+		const arr = data.replace(/\r\n/g, '\n').split(';\n');
 		count = arr.length;
 		for (var i = 0; i < arr.length; i++) {
 			var sql_str = arr[i].trim();
@@ -264,7 +267,7 @@ Mysql.prototype.save = async function(file, func, tables = []) {
 
 	try {
 		// 开始导出数据库
-		stream.write('SET FOREIGN_KEY_CHECKS = 0;\r\n\r\n');
+		stream.write('SET FOREIGN_KEY_CHECKS = 0;\n\n');
 		count++;
 
 		if (!tables.length) {
@@ -281,15 +284,15 @@ Mysql.prototype.save = async function(file, func, tables = []) {
 			try {
 				// 导出表结构
 				const createTable = await this.run(`SHOW CREATE TABLE ${tableName}`);
-				stream.write(`-- 表结构: ${tableName}\r\n`);
-				stream.write(`DROP TABLE IF EXISTS \`${tableName}\`;\r\n`);
+				stream.write(`-- 表结构: ${tableName}\n`);
+				stream.write(`DROP TABLE IF EXISTS \`${tableName}\`;\n`);
 				count++;
-				stream.write(`${createTable[0]['Create Table']};\r\n\r\n`);
+				stream.write(`${createTable[0]['Create Table']};\n\n`);
 				count++;
 				// 导出表数据
 				const rows = await this.run(`SELECT * FROM ${tableName}`);
 				if (rows.length > 0) {
-					stream.write(`-- 表数据: ${tableName}\r\n`);
+					stream.write(`-- 表数据: ${tableName}\n`);
 					for (const row of rows) {
 						const rowValues = Object.values(row)
 							.map(value => {
@@ -308,10 +311,10 @@ Mysql.prototype.save = async function(file, func, tables = []) {
 									.replace(/\u0000/g, '\\0') + "'";
 							})
 							.join(',');
-						stream.write(`INSERT INTO ${tableName} VALUES (${rowValues});\r\n`);
+						stream.write(`INSERT INTO ${tableName} VALUES (${rowValues});\n`);
 						count++;
 					}
-					stream.write('\r\n');
+					stream.write('\n');
 				}
 			} catch (err) {
 				errors.push({
@@ -328,7 +331,7 @@ Mysql.prototype.save = async function(file, func, tables = []) {
 		}
 
 		// 完成导出
-		stream.write('SET FOREIGN_KEY_CHECKS = 1;\r\n');
+		stream.write('SET FOREIGN_KEY_CHECKS = 1;\n');
 		count++;
 		stream.end();
 	} catch (err) {

package/package.json

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

package/test.js

@@ -13,32 +13,34 @@ async function test() {
 		password: "Asd159357",
 		multipleStatements: true
 	});
-	await sql.open();
-
-	db = sql.db();
-	db.table = 'user_account';
-	db.key = "user_id";
-	var obj = await db.getObj({
-		"user_id": "1"
-	});
-	console.log("查询对象", obj);
-
-	var i = 0;
-	var timer = setInterval(async () => {
-		var now = new Date();
-		var start = now.getTime();
-		console.log(start);
-		var bl = await db.set({
-			"user_id": "1"
-		}, {
-			"nickname": "hao" + (i++)
-		});
-		now = new Date();
-		var end = now.getTime();
-		console.log(end);
-		console.log(end - start);
-		console.log("测试", bl);
-	}, 3000);
+	// await sql.open();
+	
+	await sql.load("./upgrade.sql");
+	
+	// db = sql.db();
+	// db.table = 'user_account';
+	// db.key = "user_id";
+	// var obj = await db.getObj({
+	// 	"user_id": "1"
+	// });
+	// console.log("查询对象", obj);
+
+	// var i = 0;
+	// var timer = setInterval(async () => {
+	// 	var now = new Date();
+	// 	var start = now.getTime();
+	// 	console.log(start);
+	// 	var bl = await db.set({
+	// 		"user_id": "1"
+	// 	}, {
+	// 		"nickname": "hao" + (i++)
+	// 	});
+	// 	now = new Date();
+	// 	var end = now.getTime();
+	// 	console.log(end);
+	// 	console.log(end - start);
+	// 	console.log("测试", bl);
+	// }, 3000);
 
 	// obj.nickname = "hao";
 	// console.log("查询对象", obj, db.error, db.sql);
@@ -67,7 +69,7 @@ async function test() {
 	// });
 	// console.log("导入结果", ret);
 
-	// sql.close();
+	sql.close();
 
 }
 test();

package/upgrade.sql

@@ -0,0 +1,34 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 本地
+ Source Server Type    : MySQL
+ Source Server Version : 50726
+ Source Host           : localhost:3306
+ Source Schema         : card
+
+ Target Server Type    : MySQL
+ Target Server Version : 50726
+ File Encoding         : 65001
+
+ Date: 08/04/2025 09:01:37
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for test
+-- ----------------------------
+DROP TABLE IF EXISTS `test`;
+CREATE TABLE `test`  (
+  `test_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  PRIMARY KEY (`test_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of test
+-- ----------------------------
+
+SET FOREIGN_KEY_CHECKS = 1;