mm_sqlite 1.4.9 → 1.5.1

package/db.js

@@ -672,19 +672,6 @@ DB.prototype.renameTable = function (table, new_table, timeout = 15000) {
   return this.exec('ALTER TABLE `' + table + '` RENAME TO `' + new_table + '`;', [], timeout);
 };
 
-/**
- * @description 清空数据表（保留表结构）
- * @param {string} table 表名
- * @param {number} timeout - 超时时间(毫秒)
- * @returns {Promise | number} 清空成功返回1，失败返回0
- */
-DB.prototype.emptyTable = function (table, timeout = 15000) {
-  if (!table) {
-    throw new TypeError('table must be specified');
-  }
-  return this.exec('DELETE FROM `' + table + '`;', [], timeout);
-};
-
 /**
  * @description 检查表是否存在
  * @param {string} table 表名

package/index.js

@@ -111,26 +111,24 @@ SQLite.prototype.open = async function (timeout) {
  * 关闭数据库连接（统一使用连接池模式）
  * @returns {Promise<boolean>}
  */
-SQLite.prototype.close = function () {
+SQLite.prototype.close = async function () {
   if (this._status !== 'connected') {
     this.log('warn', '数据库连接未建立');
-    return Promise.resolve(false);
-  }
-
-  return new Promise((resolve) => {
-    try {
-      // 统一关闭连接池
-      this._pool.close();
-      this._db = null;
-      this._open = false;
-      this._status = 'closed';
-      resolve(true);
-    } catch (err) {
-      this.log('error', '关闭数据库连接时发生异常', err);
-      this._status = 'closed';
-      resolve(false);
-    }
-  });
+    return false;
+  }
+
+  try {
+    // 统一关闭连接池
+    this._pool.close();
+    this._db = null;
+    this._open = false;
+    this._status = 'closed';
+    return true;
+  } catch (err) {
+    this.log('error', '关闭数据库连接时发生异常', err);
+    this._status = 'closed';
+    return false;
+  }
 };
 
 /**
@@ -209,7 +207,7 @@ SQLite.prototype.run = async function (sql, params = [], timeout = 30000) {
  * @returns {Promise<object>}
  * @throws {TypeError} 当sql参数无效时
  */
-SQLite.prototype.exec = async function (sql, params, timeout) {
+SQLite.prototype.exec = async function (sql, params = [], timeout) {
   // 参数校验
   if (typeof sql !== 'string' || sql.trim() === '') {
     throw new TypeError('sql must be non-empty string');
@@ -265,7 +263,7 @@ SQLite.prototype.exec = async function (sql, params, timeout) {
  * @returns {Promise<Array>}
  * @throws {TypeError} 当table参数无效时
  */
-SQLite.prototype.read = async function (table, condition, options) {
+SQLite.prototype.read = async function (table, condition = {}, options = {}) {
   // 参数校验
   if (typeof table !== 'string' || table.trim() === '') {
     throw new TypeError('table must be non-empty string');
@@ -334,6 +332,69 @@ SQLite.prototype.db = function () {
   return new DB(this);
 };
 
+/**
+ * 初始化数据库服务（保持兼容性）
+ * @returns {Promise<void>}
+ */
+SQLite.prototype.init = async function () {
+  await this.open();
+};
+
+/**
+ * 获取连接池状态信息
+ * @returns {object} 连接池状态对象
+ */
+SQLite.prototype.getPoolStats = function () {
+  if (!this._pool || !this._pool._is_initialized) {
+    return {
+      status: 'not_initialized',
+      message: '连接池未初始化'
+    };
+  }
+
+  return {
+    status: 'healthy',
+    ...this._pool.getStats()
+  };
+};
+
+/**
+ * 健康检查
+ * @returns {Promise<object>} 健康检查结果
+ */
+SQLite.prototype.healthCheck = async function () {
+  try {
+    if (this._status !== 'connected') {
+      return {
+        status: 'error',
+        message: '数据库连接未初始化'
+      };
+    }
+
+    // 执行简单的查询来检查连接状态
+    let result = await this.run('SELECT 1 as health_check');
+
+    if (result && result.length > 0 && result[0].health_check === 1) {
+      return {
+        status: 'healthy',
+        message: '数据库连接正常',
+        ...this.getPoolStats()
+      };
+    } else {
+      return {
+        status: 'error',
+        message: '健康检查查询失败'
+      };
+    }
+  } catch (error) {
+    this.log('error', '健康检查失败', error);
+    return {
+      status: 'error',
+      message: `健康检查失败: ${error.message}`
+    };
+  }
+};
+
 // /**
 //  * 获取数据库操作实例
 //  * @param {String} database - 数据库名称

package/link_model.js

@@ -38,7 +38,7 @@ class LinkModel {
  * @param {string} table 表名
  * @returns {object}
  */
-Link_model.prototype.add = async function(table) {
+LinkModel.prototype.add = async function(table) {
   var {
     key,
     value,
@@ -77,7 +77,7 @@ Link_model.prototype.add = async function(table) {
  * @param {object} sql 数据管理器
  * @returns {object} 当前对象
  */
-Link_model.prototype.init = function(sql) {
+LinkModel.prototype.init = function(sql) {
   this.sql = sql;
   return this;
 };
@@ -88,7 +88,7 @@ Link_model.prototype.init = function(sql) {
  * @param {object} value
  * @returns {object} 当前对象
  */
-Link_model.prototype.update = function(key, value) {
+LinkModel.prototype.update = function(key, value) {
   var m = this.model;
   for (var k in m) {
     var o = m[k];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_sqlite",
-    "version": "1.4.9",
+    "version": "1.5.1",
     "description": "高性能SQLite数据库操作模块，提供与mm_mysql完全兼容的API接口，支持异步操作、事务处理和批量操作",
     "main": "index.js",
     "scripts": {
@@ -38,13 +38,13 @@
         "node": ">=14.0.0"
     },
     "dependencies": {
-        "better-sqlite3": "^13.0.2",
-        "mm_expand": "^2.4.5",
+        "better-sqlite3": "^13.0.3",
+        "mm_expand": "^2.5.1",
         "sqlstring": "^2.3.3"
     },
     "devDependencies": {
-        "eslint": "^10.8.0",
-        "eslint-plugin-jsdoc": "^63.3.2",
+        "eslint": "^10.8.1",
+        "eslint-plugin-jsdoc": "^64.0.1",
         "mm_eslint": "^1.7.5"
     }
 }

package/sql.js

@@ -23,6 +23,48 @@ function escapeId(value, forbidQualified) {
  * @property {Function} filter 设置并过滤参数
  */
 class Sql extends Base {
+  /**
+   * 过滤查询参数字典
+   */
+  static config = {
+    /**
+     * 分隔符 用于查询时的多条件处理
+     */
+    'separator': '|',
+    /**
+     * 过滤
+     */
+    'filter': {
+      /**
+       * 表名
+       */
+      'table': 'table',
+      /**
+       * 查询的页码
+       */
+      'page': 'page',
+      /**
+       * 查询每页条数
+       */
+      'size': 'size',
+      /**
+       * 操作方式: 传入参数method=add, 支持参数 add增、del删、set改、get查，为空则为get
+       */
+      'method': 'method',
+      /**
+       * 排序
+       */
+      'orderby': 'orderby',
+      /**
+       * 查询显示的字段
+       */
+      'field': 'field',
+      /**
+       * 统计结果: 统计符合条件的结果数，只有当page等于1或0时才会统计
+       */
+      'count_ret': 'count_ret'
+    }
+  };
   /**
    * @description 数据库管理器
    * @param {Function} run 查询函数
@@ -106,49 +148,6 @@ class Sql extends Base {
      */
     this.count_ret = 'false';
 
-    /**
-     * 过滤查询参数字典
-     */
-    this.config = {
-      /**
-       * 分隔符 用于查询时的多条件处理
-       */
-      'separator': '|',
-      /**
-       * 过滤
-       */
-      'filter': {
-        /**
-         * 表名
-         */
-        'table': 'table',
-        /**
-         * 查询的页码
-         */
-        'page': 'page',
-        /**
-         * 查询每页条数
-         */
-        'size': 'size',
-        /**
-         * 操作方式: 传入参数method=add, 支持参数 add增、del删、set改、get查，为空则为get
-         */
-        'method': 'method',
-        /**
-         * 排序
-         */
-        'orderby': 'orderby',
-        /**
-         * 查询显示的字段
-         */
-        'field': 'field',
-        /**
-         * 统计结果: 统计符合条件的结果数，只有当page等于1或0时才会统计
-         */
-        'count_ret': 'count_ret'
-      }
-    };
-
     this.like = false;
   }
 }
@@ -158,20 +157,17 @@ class Sql extends Base {
  * @returns {object} 返回当前对象
  */
 Sql.prototype.clear = function () {
-  this.where = '';
-  this.set = '';
-  this.order = '';
-  this.view = '';
+  // 不重置run和exec方法引用，保留构造函数中设置的函数
   this.sql = '';
-  this.error = '';
-  this.like = true;
-  this.config = {};
-  this.param = {};
+  this.error = null;
+  this.results = [];
+  this.table = '';
   this.page = 0;
-  this.size = 0;
-  this.run = null;
-  this.exec = null;
-  return this;
+  this.size = 30;
+  this.method = '';
+  this.field = '';
+  this.orderby = '';
+  this.count_ret = 'false';
 };
 
 /**
@@ -920,7 +916,7 @@ Sql.prototype.set = async function (query, body, like) {
  * @param {number} timeout 超时时间（毫秒），默认5000ms
  * @returns {Promise|Array} 查询结果
  */
-Sql.prototype.get = async function (query, sort, view, like, timeout = 5000) {
+Sql.prototype.get = async function (query, sort, view, like, timeout = 20000) {
   if (!this.table) {
     throw new Error('表名未设置');
   }
@@ -993,7 +989,7 @@ Sql.prototype.addOrSet = async function (where, set, like) {
  * @param {number} timeout 超时时间（毫秒），默认30000ms
  * @returns {Promise | number} 记录数
  */
-Sql.prototype.count = async function (query, like, timeout = 30000) {
+Sql.prototype.count = async function (query, like, timeout = 20000) {
   if (!this.table) {
     throw new Error('表名未设置');
   }
@@ -1082,7 +1078,7 @@ Sql.prototype.toBatchAddSql = function (list) {
   let columns = keys.join(',');
 
   // 构建值部分
-  let values = [];
+  let val_list = [];
   for (let item of list) {
     let values = [];
     for (let k of keys) {
@@ -1090,11 +1086,11 @@ Sql.prototype.toBatchAddSql = function (list) {
       let val = item[key];
       values.push(this.escape(val));
     }
-    values.push(`(${values.join(',')})`);
+    val_list.push(`(${values.join(',')})`);
   }
 
   // 生成最终SQL
-  let sql = `INSERT INTO \`${this.table}\` (${columns}) VALUES ${values.join(',')}`;
+  let sql = `INSERT INTO \`${this.table}\` (${columns}) VALUES ${val_list.join(',')}`;
   return sql;
 };
 
@@ -1173,7 +1169,7 @@ Sql.prototype.setList = async function (list, like = false, batch_size = 100, ti
   if (list.length <= batch_size) {
     let sql = '';
     for (let item of list) {
-      sql += this.toSetSql(item.query, item.obj, like);
+      sql += this.toSetSql(item.query, item.item, like);
     }
     this.sql = sql;
     return await this.exec(sql, [], timeout);
@@ -1196,7 +1192,7 @@ Sql.prototype.setList = async function (list, like = false, batch_size = 100, ti
 
       let batch_sql = '';
       for (let item of batch) {
-        batch_sql += this.toSetSql(item.query, item.obj, like);
+        batch_sql += this.toSetSql(item.query, item.item, like);
       }
 
       final_res = await this.exec(batch_sql, [], timeout);
@@ -1239,7 +1235,7 @@ Sql.prototype.has = function (param_dt, sql_dt) {
  * @param {object} sql_dt sql模板集合
  * @returns {string|undefined} 没有模板则返回名称，都有则返回undefined
  */
-Sql.prototype.noPrm = function (param_dt, sql_dt) {
+Sql.prototype.not = function (param_dt, sql_dt) {
   var name;
   for (var key in param_dt) {
     if (!sql_dt[key]) {
@@ -1256,11 +1252,14 @@ Sql.prototype.noPrm = function (param_dt, sql_dt) {
  * @param {object} sql_dt sql模板集合
  * @returns {object} 返回过滤后的参数集合
  */
-Sql.prototype.filtPrm = function (param_dt, sql_dt) {
-  var dt = [];
+Sql.prototype.filterParams = function (param_dt, sql_dt) {
+  var dt = {};
+  if (!param_dt || !sql_dt) {
+    return dt;
+  }
   for (var key in param_dt) {
     if (!sql_dt[key]) {
-      dt.Add(key, o.Value);
+      dt[key] = param_dt[key];
     }
   }
   return dt;
@@ -1316,9 +1315,10 @@ Sql.prototype.tplQuery = function (param_dt, sql_dt) {
     } else {
       for (var key in param_dt) {
         var value = this.escape(param_dt[key]);
-        if (sql_dt[key]) {
+        let sql = sql_dt[key];
+        if (sql) {
           // 使用直接替换方式，避免模板替换错误
-          sql += ' && ' + sql_dt[key].replaceAll('{0}', value.trim("'"));
+          sql += ' && ' + sql.replaceAll('{0}', value.trim("'"));
         } else {
           sql += ' && ' + this.escapeId(key) + ' = ' + value;
         }
@@ -1370,9 +1370,10 @@ Sql.prototype.tplBody = function (param_dt, sql_dt) {
   } else {
     for (var key in param_dt) {
       var value = this.escape(param_dt[key]);
-      if (sql_dt[key]) {
+      let sql = sql_dt[key];
+      if (sql) {
         // 使用直接替换方式，避免模板替换错误
-        let replaced = sql_dt[key].replaceAll('{0}', value.trim("'"));
+        let replaced = sql.replaceAll('{0}', value.trim("'"));
         sql += ', ' + replaced.replace('+ -', '- ').replace('- -', '+ ');
       } else {
         sql += ', ' + this.escapeId(key) + ' = ' + value;
@@ -1427,7 +1428,7 @@ Sql.prototype.model = function (model) {
  * @param {number} timeout 超时时间（毫秒），默认30000ms
  * @returns {Promise | object | null} 查询结果
  */
-Sql.prototype.getObj = async function (query, sort, view, like, timeout = 30000) {
+Sql.prototype.getObj = async function (query, sort, view, like, timeout = 20000) {
   // 保存当前分页设置
   let old_page = this.page;
   let size = this.size;