mm_sqlite 1.4.0 → 1.4.3

package/index.js

@@ -152,13 +152,8 @@ SQLite.prototype.getConn = async function (timeout) {
     await this.open(acquire_timeout);
   }
 
-  try {
-    // 统一从连接池获取连接
-    return await this._pool.getConnection(acquire_timeout);
-  } catch (error) {
-    this.log('error', '获取连接失败', error);
-    return null;
-  }
+  // 统一从连接池获取连接
+  return await this._pool.getConnection(acquire_timeout);
 };
 
 /**
@@ -196,7 +191,7 @@ SQLite.prototype.run = async function (sql, params = [], timeout = 30000) {
       timeout_id = setTimeout(() => {
         reject(new Error(`SQL查询超时: ${timeout}ms`));
       }, timeout);
-      
+
       // 执行SQL查询
       conn.all(sql, params || [], (error, rows) => {
         // 清除超时定时器
@@ -316,59 +311,53 @@ SQLite.prototype.read = async function (table, condition, options) {
     throw new TypeError('options must be object');
   }
 
-  try {
-    // 检查连接状态
-    if (this._status !== 'connected') {
-      throw new Error('数据库连接未建立');
-    }
-
-    // 构建基础SQL查询
-    let sql = `SELECT * FROM ${table}`;
-    const params = [];
+  // 检查连接状态
+  if (this._status !== 'connected') {
+    throw new Error('数据库连接未建立');
+  }
 
-    // 处理条件
-    if (condition && Object.keys(condition).length > 0) {
-      const where_clauses = [];
-      for (const [field, value] of Object.entries(condition)) {
-        where_clauses.push(`${field} = ?`);
-        params.push(value);
-      }
-      sql += ` WHERE ${where_clauses.join(' AND ')}`;
-    }
+  // 构建基础SQL查询
+  let sql = `SELECT * FROM ${table}`;
+  const params = [];
 
-    // 处理排序
-    if (options && options.order_by) {
-      sql += ` ORDER BY ${options.order_by}`;
+  // 处理条件
+  if (condition && Object.keys(condition).length > 0) {
+    const where_clauses = [];
+    for (const [field, value] of Object.entries(condition)) {
+      where_clauses.push(`${field} = ?`);
+      params.push(value);
     }
+    sql += ` WHERE ${where_clauses.join(' AND ')}`;
+  }
 
-    // 处理分页
-    if (options && options.limit) {
-      sql += ` LIMIT ${options.limit}`;
-    }
+  // 处理排序
+  if (options && options.order_by) {
+    sql += ` ORDER BY ${options.order_by}`;
+  }
 
-    if (options && options.offset) {
-      sql += ` OFFSET ${options.offset}`;
-    }
+  // 处理分页
+  if (options && options.limit) {
+    sql += ` LIMIT ${options.limit}`;
+  }
 
-    // 记录查询日志
-    if (this.config.debug) {
-      this.log('debug', '查询数据', { sql, params });
-    }
+  if (options && options.offset) {
+    sql += ` OFFSET ${options.offset}`;
+  }
 
-    // 执行查询
-    const results = await this.run(sql, params);
+  // 记录查询日志
+  if (this.config.debug) {
+    this.log('debug', '查询数据', { sql, params });
+  }
 
-    if (this.config.debug) {
-      this.log('debug', '查询成功', { count: Array.isArray(results) ? results.length : 1 });
-    }
+  // 执行查询
+  const results = await this.run(sql, params);
 
-    // 确保返回数组格式
-    return Array.isArray(results) ? results : [results];
-  } catch (error) {
-    this.log('error', '查询失败', error);
-    // 返回空数组作为默认值，保持返回值类型一致
-    return [];
+  if (this.config.debug) {
+    this.log('debug', '查询成功', { count: Array.isArray(results) ? results.length : 1 });
   }
+
+  // 确保返回数组格式
+  return Array.isArray(results) ? results : [results];
 };
 
 /**
@@ -415,7 +404,7 @@ SQLite.prototype.db = function () {
  * 开始事务
  * @returns {Promise<object>} 事务连接对象
  */
-SQLite.prototype.beginTrans = async function () {
+SQLite.prototype.beginTransaction = async function () {
   try {
     // 检查连接状态
     if (this._status !== 'connected') {
@@ -515,7 +504,7 @@ SQLite.prototype.beginTrans = async function () {
  * @returns {Promise<*>} 回调函数的返回值
  * @throws {TypeError} 当callback参数无效时
  */
-SQLite.prototype.trans = async function (callback) {
+SQLite.prototype.transaction = async function (callback) {
   // 参数校验
   if (typeof callback !== 'function') {
     throw new TypeError('callback must be function');
@@ -525,7 +514,7 @@ SQLite.prototype.trans = async function (callback) {
 
   try {
     // 开始事务
-    trans = await this.beginTrans();
+    trans = await this.beginTransaction();
 
     // 执行回调函数，传入事务对象
     const result = await callback(trans);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_sqlite",
-    "version": "1.4.0",
+    "version": "1.4.3",
     "description": "高性能SQLite数据库操作模块，提供与mm_mysql完全兼容的API接口，支持异步操作、事务处理和批量操作",
     "main": "index.js",
     "scripts": {
@@ -38,12 +38,12 @@
         "node": ">=14.0.0"
     },
     "dependencies": {
-        "mm_expand": "^2.2.8",
+        "mm_expand": "^2.3.1",
         "sqlite3": "^6.0.1",
         "sqlstring": "^2.3.3"
     },
     "devDependencies": {
-        "eslint": "^10.2.0",
+        "eslint": "^10.2.1",
         "eslint-plugin-jsdoc": "^62.9.0",
         "mm_eslint": "^1.7.1"
     }

package/pool.js

@@ -33,24 +33,19 @@ class SQLitePool {
       return;
     }
 
-    try {
-      // 创建最小连接数
-      for (let i = 0; i < this.config.pool_min; i++) {
-        const conn = await this._createConnection();
-        this._pool_connections.push(conn);
-        this._pool_available.push(conn);
-      }
+    // 创建最小连接数
+    for (let i = 0; i < this.config.pool_min; i++) {
+      const conn = await this._createConnection();
+      this._pool_connections.push(conn);
+      this._pool_available.push(conn);
+    }
 
-      // 启动连接回收器
-      this._pool_reaper = setInterval(() => {
-        this._reapIdleConnections();
-      }, this.config.pool_reap_interval);
+    // 启动连接回收器
+    this._pool_reaper = setInterval(() => {
+      this._reapIdleConnections();
+    }, this.config.pool_reap_interval);
 
-      this._is_initialized = true;
-    } catch (error) {
-      this.log('error', '连接池初始化失败', error);
-      throw error;
-    }
+    this._is_initialized = true;
   }
 
   /**