mm_mysql 2.4.1 → 2.4.2

package/db.js

@@ -79,13 +79,7 @@ DB.prototype.new = function (table = '', key = '') {
  * @returns {Promise<object>}
  */
 DB.prototype.getConn = async function () {
-  try {
-    return await this.getParent().getConn();
-  } catch (error) {
-    this.log('error', '获取连接失败', error);
-    // 返回null作为默认值，保持返回值类型一致
-    return null;
-  }
+  return await this.getParent().getConn();
 };
 
 /**
@@ -93,13 +87,7 @@ DB.prototype.getConn = async function () {
  * @returns {Promise<object>}
  */
 DB.prototype.start = async function () {
-  try {
-    return await this.getParent().beginTransaction();
-  } catch (error) {
-    this.log('error', '开始事务失败', error);
-    // 返回null作为默认值，保持返回值类型一致
-    return null;
-  }
+  return await this.getParent().beginTransaction();
 };
 
 /**
@@ -114,11 +102,7 @@ DB.prototype.commit = async function (transaction) {
     throw new TypeError('transaction must be object');
   }
 
-  try {
-    await transaction.commit();
-  } catch (error) {
-    this.log('error', '提交事务失败', error);
-  }
+  await transaction.commit();
 };
 
 /**
@@ -133,11 +117,7 @@ DB.prototype.back = async function (transaction) {
     throw new TypeError('transaction must be object');
   }
 
-  try {
-    await transaction.rollback();
-  } catch (error) {
-    this.log('error', '回滚事务失败', error);
-  }
+  await transaction.rollback();
 };
 
 /**
@@ -152,13 +132,7 @@ DB.prototype.transaction = async function (callback) {
     throw new TypeError('callback must be function');
   }
 
-  try {
-    return await this.getParent().transaction(callback);
-  } catch (error) {
-    this.log('error', '事务执行失败', error);
-    // 返回null作为默认值，保持返回值类型一致
-    return null;
-  }
+  return await this.getParent().transaction(callback);
 };
 
 /**
@@ -168,26 +142,21 @@ DB.prototype.transaction = async function (callback) {
  * @returns {Promise|Array} 表名数组
  */
 DB.prototype.tables = async function (table, timeout = 15000) {
-  try {
-    const list = await this.run('show tables', [], timeout);
-    const key = 'Tables_in_' + this.database();
-    if (table) {
-      // 简单的过滤实现
-      const filtered = [];
-      for (const item of list) {
-        const value = item[key];
-        if (value && value.includes(table)) {
-          filtered.push(item);
-        }
+  const list = await this.run('show tables', [], timeout);
+  const key = 'Tables_in_' + this.database();
+  if (table) {
+    // 简单的过滤实现
+    const filtered = [];
+    for (const item of list) {
+      const value = item[key];
+      if (value && value.includes(table)) {
+        filtered.push(item);
       }
-      return filtered.map(item => item[key]);
     }
-    // 使用原生方法提取表名
-    return list.map(item => item[key]);
-  } catch (err) {
-    this.log('error', '获取表名失败', err);
-    return [];
+    return filtered.map(item => item[key]);
   }
+  // 使用原生方法提取表名
+  return list.map(item => item[key]);
 };
 
 /**
@@ -198,28 +167,23 @@ DB.prototype.tables = async function (table, timeout = 15000) {
  * @returns {Promise|Array} 字段信息列表
  */
 DB.prototype.fields = async function (table, field_name, timeout = 15000) {
-  try {
-    const targetTable = table || this.table;
-    if (!targetTable) {
-      throw new TypeError('table must be specified');
-    }
-    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() + "'";
-    if (field_name) {
-      sql += " AND COLUMN_NAME='" + field_name + "'";
-    }
-    const list = await this.run(sql, [], timeout);
-    const len = list.length;
-    for (let i = 0; i < len; i++) {
-      list[i].pk = !!list[i].pk;
-      list[i].not_null = list[i].not_null === 'NO';
-    }
-    return list;
-  } catch (err) {
-    this.log('error', '获取字段信息失败', err);
-    return [];
+  const targetTable = table || this.table;
+  if (!targetTable) {
+    throw new TypeError('table must be specified');
+  }
+  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() + "'";
+  if (field_name) {
+    sql += " AND COLUMN_NAME='" + field_name + "'";
   }
+  const list = await this.run(sql, [], timeout);
+  const len = list.length;
+  for (let i = 0; i < len; i++) {
+    list[i].pk = !!list[i].pk;
+    list[i].not_null = list[i].not_null === 'NO';
+  }
+  return list;
 };
 
 /**
@@ -233,36 +197,31 @@ DB.prototype.fields = async function (table, field_name, timeout = 15000) {
  * @returns {Promise | number} 创建成功返回1，失败返回0
  */
 DB.prototype.addTable = async function (table, field, type = 'int', auto = true, commit = '', timeout = 15000) {
-  try {
-    if (!table || typeof table !== 'string') {
-      throw new TypeError('table must be a valid string');
-    }
-    if (!field) {
-      field = 'id';
-    }
-    // 构建完整的字段定义
-    let fieldDef = `\`${field}\` ${type}(11)`;
-    fieldDef += ' NOT NULL';
-    if (auto) {
-      fieldDef += ' AUTO_INCREMENT';
-    }
-    if (commit) {
-      fieldDef += " COMMENT '" + commit + "'";
-    }
-    fieldDef += ' PRIMARY KEY';
+  if (!table || typeof table !== 'string') {
+    throw new TypeError('table must be a valid string');
+  }
+  if (!field) {
+    field = 'id';
+  }
+  // 构建完整的字段定义
+  let fieldDef = `\`${field}\` ${type}(11)`;
+  fieldDef += ' NOT NULL';
+  if (auto) {
+    fieldDef += ' AUTO_INCREMENT';
+  }
+  if (commit) {
+    fieldDef += " COMMENT '" + commit + "'";
+  }
+  fieldDef += ' PRIMARY KEY';
 
-    let sql = 'CREATE TABLE IF NOT EXISTS \`' + table + '\` (' + fieldDef + ')';
-    sql += ' ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;';
+  let sql = 'CREATE TABLE IF NOT EXISTS \`' + table + '\` (' + fieldDef + ')';
+  sql += ' ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;';
 
-    // 执行SQL并设置表名
-    const result = await this.exec(sql, [], timeout);
-    // 设置实例的表名属性，以便后续操作使用
-    this.table = table;
-    return result;
-  } catch (err) {
-    this.log('error', '创建表失败', err);
-    return 0;
-  }
+  // 执行SQL并设置表名
+  const result = await this.exec(sql, [], timeout);
+  // 设置实例的表名属性，以便后续操作使用
+  this.table = table;
+  return result;
 };
 
 /**
@@ -304,47 +263,42 @@ DB.prototype.renameTable = function (table, new_table, timeout = 15000) {
  * @returns {Promise | number} 添加成功返回1，失败返回0
  */
 DB.prototype.addField = async function (field, type, value = '', not_null = true, auto = false, comment = '', timeout = 15000) {
-  try {
-    // 确保表名已设置
-    if (!this.table || !field || !type) {
-      throw new TypeError('table, field, and type must be specified');
-    }
-
-    // 构建字段定义
-    let fieldDef = `\`${field}\` ${type}`;
+  // 确保表名已设置
+  if (!this.table || !field || !type) {
+    throw new TypeError('table, field, and type must be specified');
+  }
 
-    // 添加非空约束
-    if (not_null) {
-      fieldDef += ' NOT NULL';
-    }
+  // 构建字段定义
+  let fieldDef = `\`${field}\` ${type}`;
 
-    // 添加自增属性
-    if (auto) {
-      fieldDef += ' AUTO_INCREMENT';
-    }
+  // 添加非空约束
+  if (not_null) {
+    fieldDef += ' NOT NULL';
+  }
 
-    // 添加默认值
-    if (value !== undefined && value !== null && value !== '') {
-      if (typeof value === 'string') {
-        fieldDef += " DEFAULT '" + value + "'";
-      } else {
-        fieldDef += ' DEFAULT ' + value;
-      }
-    }
+  // 添加自增属性
+  if (auto) {
+    fieldDef += ' AUTO_INCREMENT';
+  }
 
-    // 添加注释
-    if (comment) {
-      fieldDef += " COMMENT '" + comment + "'";
+  // 添加默认值
+  if (value !== undefined && value !== null && value !== '') {
+    if (typeof value === 'string') {
+      fieldDef += " DEFAULT '" + value + "'";
+    } else {
+      fieldDef += ' DEFAULT ' + value;
     }
+  }
 
-    // 使用ADD COLUMN而不是CHANGE COLUMN
-    const sql = `ALTER TABLE \`${this.table}\` ADD COLUMN ${fieldDef};`;
-    const result = await this.exec(sql, [], timeout);
-    return result;
-  } catch (err) {
-    this.log('error', '添加字段失败', err);
-    return 0;
+  // 添加注释
+  if (comment) {
+    fieldDef += " COMMENT '" + comment + "'";
   }
+
+  // 使用ADD COLUMN而不是CHANGE COLUMN
+  const sql = `ALTER TABLE \`${this.table}\` ADD COLUMN ${fieldDef};`;
+  const result = await this.exec(sql, [], timeout);
+  return result;
 };
 
 /**
@@ -360,36 +314,31 @@ DB.prototype.addField = async function (field, type, value = '', not_null = true
  * @returns {Promise | number} 修改成功返回1，失败返回0
  */
 DB.prototype.setField = async function (field, type, value = '', not_null = true, auto = false, isKey = false, new_name = '', timeout = 15000) {
-  try {
-    if (!field || !type || !this.table) {
-      throw new TypeError('field, type, and table must be specified');
-    }
-    const targetName = new_name || field;
-    let fieldDef = `\`${targetName}\` ${type}`;
-    if (not_null) {
-      fieldDef += ' NOT NULL';
-    }
-    if (auto) {
-      fieldDef += ' AUTO_INCREMENT';
-    }
-    if (value !== undefined && value !== null && value !== '') {
-      if (typeof value === 'string') {
-        fieldDef += " DEFAULT '" + value + "'";
-      } else {
-        fieldDef += ' DEFAULT ' + value;
-      }
-    }
-    let sql = `ALTER TABLE \`${this.table}\` CHANGE COLUMN \`${field}\` ${fieldDef}`;
-    if (isKey) {
-      sql += ', ADD PRIMARY KEY (\`' + targetName + '\`)';
+  if (!field || !type || !this.table) {
+    throw new TypeError('field, type, and table must be specified');
+  }
+  const targetName = new_name || field;
+  let fieldDef = `\`${targetName}\` ${type}`;
+  if (not_null) {
+    fieldDef += ' NOT NULL';
+  }
+  if (auto) {
+    fieldDef += ' AUTO_INCREMENT';
+  }
+  if (value !== undefined && value !== null && value !== '') {
+    if (typeof value === 'string') {
+      fieldDef += " DEFAULT '" + value + "'";
+    } else {
+      fieldDef += ' DEFAULT ' + value;
     }
-    sql += ';';
-    const result = await this.exec(sql, [], timeout);
-    return result;
-  } catch (err) {
-    this.log('error', '修改字段失败', err);
-    return 0;
   }
+  let sql = `ALTER TABLE \`${this.table}\` CHANGE COLUMN \`${field}\` ${fieldDef}`;
+  if (isKey) {
+    sql += ', ADD PRIMARY KEY (\`' + targetName + '\`)';
+  }
+  sql += ';';
+  const result = await this.exec(sql, [], timeout);
+  return result;
 };
 
 /**
@@ -447,16 +396,11 @@ DB.prototype.getCreateTable = async function (table, timeout = 15000) {
   if (!table) {
     throw new TypeError('table must be specified');
   }
-  try {
-    const list = await this.run('SHOW CREATE TABLE \`' + table + '\`;', [], timeout);
-    if (list && list.length > 0) {
-      return list[0]['Create Table'] || list[0]['create table'];
-    }
-    return '';
-  } catch (err) {
-    this.log('error', '获取表结构失败', err);
-    return '';
+  const list = await this.run('SHOW CREATE TABLE \`' + table + '\`;', [], timeout);
+  if (list && list.length > 0) {
+    return list[0]['Create Table'] || list[0]['create table'];
   }
+  return '';
 };
 
 /**
@@ -470,51 +414,46 @@ DB.prototype.getTableData = async function (table, batchSize = 100, timeout = 60
   if (!table) {
     throw new TypeError('table must be specified');
   }
-  try {
-    // 获取表数据
-    const rows = await this.run(`SELECT * FROM \`${table}\``, [], timeout);
-    let sql = '';
-
-    if (rows && rows.length > 0) {
-      sql += `-- 表数据: ${table}\n`;
-
-      // 批量处理大数据量
-      for (let j = 0; j < rows.length; j += batchSize) {
-        const batch = rows.slice(j, j + batchSize);
-        for (const row of batch) {
-          try {
-            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.toISOString().slice(0, 19).replace('T', ' ') + "'";
-                }
-                // 处理字符串，转义特殊字符
-                if (typeof value === 'string') {
-                  return "'" + value
-                    .replace(/[\\']/g, '\\$&')
-                    .replace(/\n/g, '\\n')
-                    .replace(/\r/g, '\\r')
-                    .replace(/\t/g, '\\t')
-                    .replace(/\u0000/g, '\\0') + "'";
-                }
-                return "'" + String(value || '') + "'";
-              }).join(',');
-            sql += `INSERT INTO \`${table}\` VALUES (${rowValues});\n`;
-          } catch (rowErr) {
-            this.log('error', '处理行数据失败', rowErr);
-          }
+  // 获取表数据
+  const rows = await this.run(`SELECT * FROM \`${table}\``, [], timeout);
+  let sql = '';
+
+  if (rows && rows.length > 0) {
+    sql += `-- 表数据: ${table}\n`;
+
+    // 批量处理大数据量
+    for (let j = 0; j < rows.length; j += batchSize) {
+      const batch = rows.slice(j, j + batchSize);
+      for (const row of batch) {
+        try {
+          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.toISOString().slice(0, 19).replace('T', ' ') + "'";
+              }
+              // 处理字符串，转义特殊字符
+              if (typeof value === 'string') {
+                return "'" + value
+                  .replace(/[\\']/g, '\\$&')
+                  .replace(/\n/g, '\\n')
+                  .replace(/\r/g, '\\r')
+                  .replace(/\t/g, '\\t')
+                  .replace(/\u0000/g, '\\0') + "'";
+              }
+              return "'" + String(value || '') + "'";
+            }).join(',');
+          sql += `INSERT INTO \`${table}\` VALUES (${rowValues});\n`;
+        } catch (rowErr) {
+          this.log('error', '处理行数据失败', rowErr);
         }
       }
-      sql += '\n';
     }
-    return sql;
-  } catch (err) {
-    this.log('error', '获取表数据失败', err);
-    return '';
+    sql += '\n';
   }
+  return sql;
 };
 
 /**
@@ -540,13 +479,8 @@ DB.prototype.hasTable = async function (table, timeout = 15000) {
   if (!table || typeof table !== 'string') {
     return false;
   }
-  try {
-    const list = await this.run("SHOW TABLES LIKE '" + table + "'", [], timeout);
-    return list && list.length > 0;
-  } catch (err) {
-    this.log('error', '检查表是否存在失败', err);
-    return false;
-  }
+  const list = await this.run("SHOW TABLES LIKE '" + table + "'", [], timeout);
+  return list && list.length > 0;
 };
 
 /**
@@ -560,13 +494,8 @@ DB.prototype.hasField = async function (table, field, timeout = 15000) {
   if (!table || !field) {
     return false;
   }
-  try {
-    const list = await this.fields(table, field, timeout);
-    return list && list.length > 0;
-  } catch (err) {
-    this.log('error', '检查字段是否存在失败', err);
-    return false;
-  }
+  const list = await this.fields(table, field, timeout);
+  return list && list.length > 0;
 };
 
 /**

package/index.js

@@ -153,23 +153,6 @@ Mysql.prototype.close = async function () {
   }
 };
 
-/**
- * 安全释放数据库连接
- * @param {object} conn - 数据库连接对象
- * @returns {Promise<void>}
- */
-async function releaseConn(conn) {
-  if (!conn) return;
-
-  try {
-    if (typeof conn.release === 'function') {
-      await conn.release();
-    }
-  } catch (release_err) {
-    $.log.error('释放连接失败', release_err);
-  }
-};
-
 /**
    * 获取数据库连接（统一使用连接池）
    * @returns {Promise<object>}
@@ -181,13 +164,8 @@ Mysql.prototype.getConn = async function () {
     await this.open();
   }
 
-  try {
-    // 统一从连接池获取连接
-    return await this._pool.getConnection();
-  } catch (error) {
-    this.log('error', '从连接池获取连接失败', error);
-    throw error; // 重新抛出错误，让调用方处理
-  }
+  // 统一从连接池获取连接
+  return await this._pool.getConnection();
 };
 
 /**
@@ -503,6 +481,23 @@ function mysqlAdmin(scope, config) {
   return $.pool.mysql[scope];
 }
 
+/**
+ * 安全释放数据库连接
+ * @param {object} conn - 数据库连接对象
+ * @returns {Promise<void>}
+ */
+async function releaseConn(conn) {
+  if (!conn) return;
+
+  try {
+    if (typeof conn.release === 'function') {
+      await conn.release();
+    }
+  } catch (release_err) {
+    $.log.error('释放连接失败', release_err);
+  }
+};
+
 /**
  * @module 导出Mysql管理器
  */

package/package.json

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