mm_mysql 1.9.2 → 1.9.3

package/index.js

@@ -11,7 +11,9 @@ const {
 } = require('./db');
 
 const Link_model = require('./link_model');
-const { table } = require('console');
+const {
+	table
+} = require('console');
 
 var pool = {};
 
@@ -81,16 +83,20 @@ class Mysql {
 		 * @param {Array} val 替换值
 		 * @return {Promise|Array} 异步构造器, 当await时返回执行结果
 		 */
-		this.run = function (sql, val) {
+		this.run = function(sql, val) {
 			var _this = this;
 			this.sql = sql;
 			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) {
+				$this.conn.getConnection(function(err, db) {
 					if (err) {
 						_this.error = {
 							code: 2003,
@@ -132,7 +138,7 @@ class Mysql {
 		 * @param {Array} val 替换值
 		 * @return {Promise|Array} 异步构造器, 当await时返回执行结果
 		 */
-		this.exec = function (sql, val) {
+		this.exec = function(sql, val) {
 			var _this = this;
 			if (this.task) {
 				this.task_sql += sql + "\r\n";
@@ -152,9 +158,14 @@ 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) {
+				$this.conn.getConnection(function(err, db) {
 					if (err) {
 						_this.error = {
 							code: 41000,
@@ -183,7 +194,7 @@ class Mysql {
 								if (o.constructor == Array) {
 									if (o.length > 0) {
 										var num = 0;
-										o.map(function (item) {
+										o.map(function(item) {
 											num += item['affectedRows'];
 										});
 										if (num === 0) {
@@ -214,7 +225,7 @@ class Mysql {
 		/**
 		 * @description 获取数据库管理器
 		 */
-		this.db = function () {
+		this.db = function() {
 			return new DB($this);
 		};
 	}
@@ -226,7 +237,7 @@ class Mysql {
  * @param {Function} func 回调函数
  * @return {Promise} 异步构造器, 当await时返回执行结果
  */
-Mysql.prototype.load = async function (file, func) {
+Mysql.prototype.load = async function(file, func) {
 	var count = 0;
 	var progress = 0;
 	var errors = [];
@@ -275,7 +286,7 @@ Mysql.prototype.load = async function (file, func) {
  * @param {Function} func 回调函数
  * @return {Promise} 异步构造器, 当await时返回执行结果
  */
-Mysql.prototype.save = async function (file, func, tables = []) {
+Mysql.prototype.save = async function(file, func, tables = []) {
 	const fs = require('fs');
 	const stream = fs.createWriteStream(file);
 	let count = 0;
@@ -289,14 +300,14 @@ Mysql.prototype.save = async function (file, func, tables = []) {
 		stream.write('SET FOREIGN_KEY_CHECKS = 0;\r\n\r\n');
 		count++;
 
-		if(!tables.length) {
+		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++) {
@@ -376,7 +387,7 @@ Mysql.prototype.save = async function (file, func, tables = []) {
  * @param {Array} arr_table 关联的数据表
  * @return {Object} 管理模型
  */
-Mysql.prototype.dbs = async function (key, value, clear_prefix, ...arr_table) {
+Mysql.prototype.dbs = async function(key, value, clear_prefix, ...arr_table) {
 	var lm = new Link_model({
 		key,
 		value,
@@ -393,9 +404,9 @@ Mysql.prototype.dbs = async function (key, value, clear_prefix, ...arr_table) {
  * 设置配置参数
  * @param {Object} cg 配置对象或配置路径
  */
-Mysql.prototype.setConfig = function (cg) {
+Mysql.prototype.setConfig = function(cg) {
 	var obj;
-	if (typeof (cg) === "string") {
+	if (typeof(cg) === "string") {
 		obj = cg.loadJson(this.dir);
 	} else {
 		obj = cg;
@@ -408,7 +419,7 @@ Mysql.prototype.setConfig = function (cg) {
  * @description 打开数据库, 如果没有则建立数据库连接再打开
  * @param {boolean} 是否重置
  */
-Mysql.prototype.open = function (reset) {
+Mysql.prototype.open = function(reset) {
 	if (reset || !this.state || !pool[this.identifier]) {
 		this.state = 1;
 		pool[this.identifier] = createPool(this.config);
@@ -419,7 +430,7 @@ Mysql.prototype.open = function (reset) {
 /**
  * @description 关闭连接
  */
-Mysql.prototype.close = function () {
+Mysql.prototype.close = function() {
 	if (pool[this.identifier]) {
 		pool[this.identifier].end();
 		pool[this.identifier] = null;

package/package.json

@@ -1,33 +1,33 @@
-{
-  "name": "mm_mysql",
-  "version": "1.9.2",
-  "description": "这是超级美眉mysql帮助函数模块，用于便捷操作mysql，使用await方式，可以避免嵌套函数",
-  "main": "index.js",
-  "scripts": {
-    "test": "node test.js",
-    "dev": "nodemon test.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/qiuwenwu91/mm_mysql.git"
-  },
-  "keywords": [
-    "mysql",
-    "async",
-    "await",
-    "promise",
-    "add",
-    "del",
-    "set",
-    "get",
-    "query",
-    "run",
-    "exec"
-  ],
-  "author": "qww",
-  "license": "ISC",
-  "dependencies": {
-    "mm_logs": "^1.1.7",
-    "mysql": "^2.18.1"
-  }
-}
+{
+	"name": "mm_mysql",
+	"version": "1.9.3",
+	"description": "这是超级美眉mysql帮助函数模块，用于便捷操作mysql，使用await方式，可以避免嵌套函数",
+	"main": "index.js",
+	"dependencies": {
+		"mm_expand": "^1.8.0",
+		"mm_logs": "^1.1.7"
+	},
+	"scripts": {
+		"test": "node test.js",
+		"dev": "nodemon test.js"
+	},
+	"repository": {
+		"type": "git",
+		"url": "https://gitee.com/qiuwenwu91/mm_mysql.git"
+	},
+	"keywords": [
+		"mysql",
+		"async",
+		"await",
+		"promise",
+		"add",
+		"del",
+		"set",
+		"get",
+		"query",
+		"run",
+		"exec"
+	],
+	"author": "qww",
+	"license": "ISC"
+}

package/test.js

@@ -13,19 +13,26 @@ async function test() {
 		password: "Asd159357",
 		multipleStatements: true
 	});
-	await sql.open();
+	// 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);