mm_mysql 2.3.6 → 2.3.8

package/db.js

@@ -27,7 +27,7 @@ class DB extends Sql {
      * 获取上级
      * @returns {object} 返回上级管理器
      */
-    this.parent = function () {
+    this.getParent = function () {
       return mysql;
     };
   }
@@ -53,7 +53,7 @@ DB.prototype._createTimeoutPromise = function (timeout, message) {
  * @returns {string} 数据库
  */
 DB.prototype.database = function () {
-  return this.parent().config.database;
+  return this.getParent().config.database;
 };
 
 /**
@@ -62,12 +62,12 @@ DB.prototype.database = function () {
  * @param {string} key 键名
  * @returns {object} 返回管理器
  */
-DB.prototype.new = function (table, key) {
-  const db = this.parent().db();
+DB.prototype.new = function (table = '', key = '') {
+  const db = this.getParent().db();
   db.table = table;
   if (key) {
     db.key = key;
-  } else {
+  } else if (table) {
     const arr = table.split('_');
     db.key = arr[arr.length - 1] + '_id';
   }
@@ -78,9 +78,9 @@ DB.prototype.new = function (table, key) {
  * 获取数据库连接
  * @returns {Promise<object>}
  */
-DB.prototype.getConn = async function() {
+DB.prototype.getConn = async function () {
   try {
-    return await this.parent().getConn();
+    return await this.getParent().getConn();
   } catch (error) {
     this.log('error', '获取连接失败', error);
     // 返回null作为默认值，保持返回值类型一致
@@ -92,9 +92,9 @@ DB.prototype.getConn = async function() {
  * 开始事务
  * @returns {Promise<object>}
  */
-DB.prototype.start = async function() {
+DB.prototype.start = async function () {
   try {
-    return await this.parent().beginTransaction();
+    return await this.getParent().beginTransaction();
   } catch (error) {
     this.log('error', '开始事务失败', error);
     // 返回null作为默认值，保持返回值类型一致
@@ -108,12 +108,12 @@ DB.prototype.start = async function() {
  * @returns {Promise<void>}
  * @throws {TypeError} 当transaction参数无效时
  */
-DB.prototype.commit = async function(transaction) {
+DB.prototype.commit = async function (transaction) {
   // 参数校验
   if (!transaction || typeof transaction !== 'object') {
     throw new TypeError('transaction must be object');
   }
-    
+
   try {
     await transaction.commit();
   } catch (error) {
@@ -127,12 +127,12 @@ DB.prototype.commit = async function(transaction) {
  * @returns {Promise<void>}
  * @throws {TypeError} 当transaction参数无效时
  */
-DB.prototype.back = async function(transaction) {
+DB.prototype.back = async function (transaction) {
   // 参数校验
   if (!transaction || typeof transaction !== 'object') {
     throw new TypeError('transaction must be object');
   }
-    
+
   try {
     await transaction.rollback();
   } catch (error) {
@@ -146,14 +146,14 @@ DB.prototype.back = async function(transaction) {
  * @returns {Promise<*>}
  * @throws {TypeError} 当callback参数无效时
  */
-DB.prototype.transaction = async function(callback) {
+DB.prototype.transaction = async function (callback) {
   // 参数校验
   if (typeof callback !== 'function') {
     throw new TypeError('callback must be function');
   }
-    
+
   try {
-    return await this.parent().transaction(callback);
+    return await this.getParent().transaction(callback);
   } catch (error) {
     this.log('error', '事务执行失败', error);
     // 返回null作为默认值，保持返回值类型一致
@@ -205,7 +205,7 @@ DB.prototype.fields = async function (table, field_name, timeout = 15000) {
     }
     const field = 'COLUMN_NAME as `name`,ORDINAL_POSITION as `cid`,COLUMN_DEFAULT as `default_value`,IS_NULLABLE as `not_null`,COLUMN_TYPE as `type`,COLUMN_KEY as `pk`,EXTRA as `auto`,COLUMN_COMMENT as `note`';
     let sql = 'select ' + field + " from information_schema.COLUMNS where `table_name` = '" + targetTable +
-			"' and `table_schema` = '" + this.database() + "'";
+      "' and `table_schema` = '" + this.database() + "'";
     if (field_name) {
       sql += " AND COLUMN_NAME='" + field_name + "'";
     }

package/package.json

@@ -1,10 +1,10 @@
 {
 	"name": "mm_mysql",
-	"version": "2.3.6",
+	"version": "2.3.8",
 	"description": "这是超级美眉mysql帮助函数模块，用于便捷操作mysql，使用await方式，可以避免嵌套函数",
 	"main": "index.js",
 	"dependencies": {
-		"mm_expand": "^2.1.9",
+		"mm_expand": "^2.2.8",
 		"mysql2": "^3.22.0",
 		"sqlstring": "^2.3.3"
 	},