mm_sqlite 1.5.6 → 1.5.8

package/lib/query_error.js

@@ -0,0 +1,22 @@
+'use strict';
+
+/**
+ * 构造带上下文的数据层错误
+ *
+ * 独立函数而非实例方法：DB 包装层以 `super(sqlite.run, sqlite.exec)` 传递未绑定的方法引用，
+ * 调用时 this 指向 DB 实例而不是 SQLite 实例，任何 this.xxx 辅助方法都会失效。
+ * 用模块级函数可同时覆盖「SQLite 直接被调用」与「经 DB 包装调用」两条路径。
+ *
+ * @param {Error} cause 驱动抛出的原始异常
+ * @param {string} sql 出错的 SQL
+ * @param {Array} params 绑定参数
+ * @returns {Error} 携带 code / sql / params / cause 的错误对象
+ */
+module.exports = function makeQueryError(cause, sql, params) {
+  const error = new Error(`SQL执行失败: ${cause.message || cause}`);
+  error.code = cause.code || cause.errno;
+  error.sql = sql;
+  error.params = params;
+  error.cause = cause;
+  return error;
+};

package/lib/sql.js

@@ -1382,25 +1382,29 @@ Sql.prototype.tplQuery = function (param_dt, sql_dt) {
  * @returns {string} 返回拼接的查询参数
  */
 Sql.prototype.tplBody = function (param_dt, sql_dt) {
-  var sql = '';
-  if (!sql_dt || sql_dt.length === 0) {
+  if (!param_dt) {
+    return '';
+  }
+  var parts = [];
+  if (!sql_dt || Object.keys(sql_dt).length === 0) {
     for (var key in param_dt) {
-      sql += ', ' + this.escapeId(key) + ' = ' + this.escape(val[key]);
+      parts.push(this.escapeId(key) + ' = ' + this.escape(param_dt[key]));
     }
   } else {
-    for (var key in param_dt) {
-      var value = this.escape(param_dt[key]);
-      let sql = sql_dt[key];
-      if (sql) {
+    for (var k in param_dt) {
+      var value = this.escape(param_dt[k]);
+      // 不能再用 sql 作局部变量名，否则会遮蔽累加结果，SET 子句恒为空
+      var tpl = sql_dt[k];
+      if (tpl) {
         // 使用直接替换方式，避免模板替换错误
-        let replaced = sql.replaceAll('{0}', value.trim("'"));
-        sql += ', ' + replaced.replace('+ -', '- ').replace('- -', '+ ');
+        var replaced = tpl.replaceAll('{0}', value.trim("'"));
+        parts.push(replaced.replace(/\+ -/g, '- ').replace(/- -/g, '+ '));
       } else {
-        sql += ', ' + this.escapeId(key) + ' = ' + value;
+        parts.push(this.escapeId(k) + ' = ' + value);
       }
     }
   }
-  return sql.replace(/^, /, '');
+  return parts.join(', ');
 };
 
 /**

package/lib/sqlite.js

@@ -4,6 +4,7 @@ const {
 const { Base } = require('mm_mod');
 const { fullname, addDir } = require('mm_helper');
 const SQLitePool = require('./pool');
+const makeQueryError = require('./query_error');
 
 
 /**
@@ -189,13 +190,15 @@ SQLite.prototype.run = async function (sql, params = [], timeout = 30000) {
     const stmt = conn.prepare(sql);
     ret = params.length > 0 ? stmt.all(...params) : stmt.all();
   } catch (error) {
-    console.error('SQL执行失败', error);
+    // D-12：查询失败必须与「查到 0 条」区分。历史实现把异常吞成 []，
+    // 上层拿到空结果继续跑，最终以 TypeError / 空页面呈现，根因彻底丢失。
+    // 这里补齐上下文后抛出，由调用方决定降级或失败；同时不再直接 console.error（D-15）
     this.sql = sql;
     this.error = {
       code: error.code || error.errno,
       message: error.message
     };
-    ret = [];
+    throw makeQueryError(error, sql, params);
   } finally {
     await releaseConn(conn);
   }
@@ -250,13 +253,13 @@ SQLite.prototype.exec = async function (sql, params = [], timeout) {
     }
     ret = info.lastInsertRowid || info.changes || 1;
   } catch (error) {
-    console.error('SQL执行失败', error);
+    // 写操作失败同样不能伪装成「影响 0 行」：上层会把「没更新」当成正常结果
     this.sql = sql;
     this.error = {
       code: error.code || error.errno,
       message: error.message
     };
-    ret = 0;
+    throw makeQueryError(error, sql, params);
   } finally {
     await releaseConn(conn);
   }

package/package.json

@@ -1,56 +1,56 @@
-{
-    "name": "mm_sqlite",
-    "version": "1.5.6",
-    "description": "高性能SQLite数据库操作模块，提供与mm_mysql完全兼容的API接口，支持异步操作、事务处理和批量操作",
-    "main": "index.js",
-    "scripts": {
-        "test": "node test.js",
-        "dev": "nodemon test.js",
-        "lint": "eslint . --config eslint.config.js",
-        "lint:fix": "eslint . --config eslint.config.js --fix"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://gitee.com/qiuwenwu91/mm_sqlite.git"
-    },
-    "keywords": [
-        "mm_mod",
-        "mm_adapter",
-        "mm_persist",
-        "sqlite",
-        "node.js",
-        "async",
-        "await",
-        "promise",
-        "database",
-        "transaction",
-        "batch",
-        "sql",
-        "mm_mysql",
-        "compatible",
-        "node-sqlite3",
-        "async-await"
-    ],
-    "layer": "adapter",
-    "group": "persist",
-    "author": "邱文武",
-    "license": "MIT",
-    "bugs": {
-        "url": "https://gitee.com/qiuwenwu91/mm_sqlite/issues"
-    },
-    "homepage": "https://gitee.com/qiuwenwu91/mm_sqlite#readme",
-    "engines": {
-        "node": ">=22.13.0"
-    },
-    "dependencies": {
-        "mm_corejs": "^1.1.4",
-        "mm_mod": "^1.0.1",
-        "mm_helper": "^1.0.0",
-        "sqlstring": "^2.3.3"
-    },
-    "devDependencies": {
-        "eslint": "^10.9.1",
-        "eslint-plugin-jsdoc": "^64.2.1",
-        "mm_eslint": "^1.7.7"
-    }
-}
+{
+    "name": "mm_sqlite",
+    "version": "1.5.8",
+    "description": "高性能SQLite数据库操作模块，提供与mm_mysql完全兼容的API接口，支持异步操作、事务处理和批量操作",
+    "main": "index.js",
+    "scripts": {
+        "test": "node test.js",
+        "dev": "nodemon test.js",
+        "lint": "eslint . --config eslint.config.js",
+        "lint:fix": "eslint . --config eslint.config.js --fix"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://gitee.com/qiuwenwu91/mm_sqlite.git"
+    },
+    "keywords": [
+        "mm_mod",
+        "mm_adapter",
+        "mm_persist",
+        "sqlite",
+        "node.js",
+        "async",
+        "await",
+        "promise",
+        "database",
+        "transaction",
+        "batch",
+        "sql",
+        "mm_mysql",
+        "compatible",
+        "node-sqlite3",
+        "async-await"
+    ],
+    "layer": "adapter",
+    "group": "persist",
+    "author": "邱文武",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://gitee.com/qiuwenwu91/mm_sqlite/issues"
+    },
+    "homepage": "https://gitee.com/qiuwenwu91/mm_sqlite#readme",
+    "engines": {
+        "node": ">=22.13.0"
+    },
+    "dependencies": {
+        "mm_corejs": "^1.1.4",
+        "mm_mod": "^1.0.1",
+        "mm_helper": "^1.0.0",
+        "sqlstring": "^2.3.3"
+    },
+    "devDependencies": {
+        "eslint": "^10.9.1",
+        "eslint-plugin-jsdoc": "^64.2.1",
+        "mm_eslint": "^1.7.7"
+    }
+}