tangbao-he-db-helper 1.0.21 → 1.0.24

package/README.md

@@ -29,6 +29,7 @@ MyBatis-style database helper for Node-RED with MySQL and SQLite support.
 
 - Node.js >= 18.0
 - Node-RED >= 4.0.0
+- **For SQLite support**: `better-sqlite3` >= 12.0.0 (installed separately)
 
 ## Installation
 
@@ -41,7 +42,7 @@ Or install from a local `.tgz` file:
 
 ```bash
 cd ~/.node-red
-npm install /path/to/tangbao-he-db-helper-1.0.17.tgz
+npm install /path/to/tangbao-he-db-helper-*.tgz
 ```
 
 **For SQLite support, also install:**
@@ -72,7 +73,8 @@ When you select a driver in the configuration panel, the available fields automa
 - **SQLite**: Database File Path only (e.g., `/data/mydb.db` or `./mydb.db`)
 
 **MySQL Settings:**
-- Host, Port, Database, User, Password
+- Host, Port, Database
+- User / Password (stored in Node-RED credentials, encrypted at rest)
 - Charset (default: `UTF8_GENERAL_CI`)
 - Timezone (default: `local`)
 - Connection Pool Limit (default: `50`)
@@ -163,6 +165,8 @@ Pre-built CRUD operations. No SQL writing needed.
 **SQLite Upsert Note:**
 SQLite uses `ON CONFLICT(id) DO UPDATE SET col = excluded.col` instead of MySQL's `ON DUPLICATE KEY UPDATE col = VALUES(col)`. The CRUD node automatically selects the correct syntax based on your configured driver.
 
+> **Important:** For `upsertBatch` to work with SQLite, the target table must have a **PRIMARY KEY** or **UNIQUE** constraint on the `idColumn`. Otherwise SQLite will raise a conflict resolution error.
+
 **Array to IN:**
 
 For `selectList`, `selectOne`, `selectCount`, and `selectPage`, array values are automatically converted to `IN` conditions:
@@ -250,10 +254,23 @@ msg.params = { userName: "Alice", userAge: 20 };
 
 2. Restart Node-RED.
 
-3. Create a `tangbao-db-config` node, select **SQLite** as the driver, and enter the database file path (e.g., `./data.db`).
+3. Create a `tangbao-db-config` node, select **SQLite** as the driver, and enter the database file path (e.g., `./data.db` or an absolute path like `/data/mydb.db`).
 
 4. Use `tangbao-db-crud` or `tangbao-db-query` / `tangbao-db-execute` as usual. All CRUD operations work the same way.
 
+### SQLite vs MySQL Quick Reference
+
+| Feature | MySQL | SQLite |
+|---------|-------|--------|
+| Connection | TCP (host:port) | Local file |
+| Auth | User / Password | None |
+| Pooling | Yes (configurable) | No (single connection) |
+| Auto-reconnect | Yes | N/A |
+| `upsertBatch` | `ON DUPLICATE KEY UPDATE` | `ON CONFLICT DO UPDATE` (requires PK/UNIQUE) |
+| `deleteAndInsertBatch` | Transaction | Transaction |
+| Table discovery | `information_schema` | `sqlite_master` |
+| Multi-statement execute | Supported with params | Supported **without** params |
+
 ## Logging Configuration (日志配置)
 
 本节点包使用 `node.log` / `node.error` 输出运行日志，其输出级别受 Node-RED 全局日志配置控制。

package/db-config.js

@@ -180,6 +180,117 @@ module.exports = function(RED) {
         }
     };
 
+    /**
+     * 安全拆分 SQL 语句（排除字符串和注释内的分号）
+     */
+    function splitSqlStatements(sql) {
+        var statements = [];
+        var current = '';
+        var inString = false;
+        var stringChar = null;
+        var inComment = false;
+        var commentType = null; // 'line' or 'block'
+        var i = 0;
+        while (i < sql.length) {
+            var ch = sql[i];
+            var next = sql[i + 1];
+            if (inComment) {
+                if (commentType === 'line' && ch === '\n') {
+                    inComment = false;
+                    commentType = null;
+                } else if (commentType === 'block' && ch === '*' && next === '/') {
+                    inComment = false;
+                    commentType = null;
+                    i++;
+                }
+                current += ch;
+            } else if (inString) {
+                if (ch === '\\' && i + 1 < sql.length) {
+                    current += ch + sql[i + 1];
+                    i++;
+                } else if (ch === stringChar) {
+                    inString = false;
+                    stringChar = null;
+                    current += ch;
+                } else {
+                    current += ch;
+                }
+            } else {
+                if (ch === '-' && next === '-') {
+                    inComment = true;
+                    commentType = 'line';
+                    current += ch;
+                } else if (ch === '/' && next === '*') {
+                    inComment = true;
+                    commentType = 'block';
+                    current += ch;
+                } else if (ch === "'" || ch === '"') {
+                    inString = true;
+                    stringChar = ch;
+                    current += ch;
+                } else if (ch === ';') {
+                    statements.push(current.trim());
+                    current = '';
+                } else {
+                    current += ch;
+                }
+            }
+            i++;
+        }
+        if (current.trim()) {
+            statements.push(current.trim());
+        }
+        return statements;
+    }
+
+    /**
+     * 统计 SQL 中 ? 占位符数量（排除字符串/注释内）
+     */
+    function countPlaceholders(sql) {
+        var count = 0;
+        var inString = false;
+        var stringChar = null;
+        var inComment = false;
+        var commentType = null;
+        var i = 0;
+        while (i < sql.length) {
+            var ch = sql[i];
+            var next = sql[i + 1];
+            if (inComment) {
+                if (commentType === 'line' && ch === '\n') {
+                    inComment = false;
+                    commentType = null;
+                } else if (commentType === 'block' && ch === '*' && next === '/') {
+                    inComment = false;
+                    commentType = null;
+                    i++;
+                }
+            } else if (inString) {
+                if (ch === '\\' && i + 1 < sql.length) {
+                    i++;
+                } else if (ch === stringChar) {
+                    inString = false;
+                    stringChar = null;
+                }
+            } else {
+                if (ch === '-' && next === '-') {
+                    inComment = true;
+                    commentType = 'line';
+                } else if (ch === '/' && next === '*') {
+                    inComment = true;
+                    commentType = 'block';
+                } else if (ch === "'" || ch === '"') {
+                    inString = true;
+                    stringChar = ch;
+                } else if (ch === '?') {
+                    count++;
+                }
+            }
+            i++;
+        }
+        return count;
+    }
+
     /**
      * SQLite 驱动实现
      */
@@ -227,9 +338,34 @@ module.exports = function(RED) {
             if (!this.db) {
                 throw new Error('SQLite database is not available');
             }
-            var stmt = this.db.prepare(sql);
-            var info = stmt.run(params || []);
-            return { affectedRows: info.changes || 0, insertId: info.lastInsertRowid };
+            params = params || [];
+            // 安全拆分多语句：排除字符串/注释内的分号
+            var statements = splitSqlStatements(sql);
+            if (statements.length === 0) {
+                throw new Error('No valid SQL statement found');
+            }
+            var totalAffected = 0;
+            var lastInsertId = null;
+            var paramIdx = 0;
+            for (var i = 0; i < statements.length; i++) {
+                var stmtSql = statements[i].trim();
+                if (!stmtSql) continue;
+                // 统计该语句中的 ? 占位符数量（排除字符串内的）
+                var placeholderCount = countPlaceholders(stmtSql);
+                var stmtParams = params.slice(paramIdx, paramIdx + placeholderCount);
+                paramIdx += placeholderCount;
+                if (placeholderCount === 0) {
+                    this.db.exec(stmtSql);
+                } else {
+                    var stmt = this.db.prepare(stmtSql);
+                    var info = stmt.run(stmtParams);
+                    totalAffected += info.changes || 0;
+                    if (info.lastInsertRowid != null) {
+                        lastInsertId = info.lastInsertRowid;
+                    }
+                }
+            }
+            return { affectedRows: totalAffected, insertId: lastInsertId };
         } catch (err) {
             this.node.error('SQLite execute failed: ' + err.message);
             throw err;

package/db-crud.html

@@ -159,7 +159,7 @@
                 }
 
                 $select.html('<option value="">-- 加载中 --</option>');
-                $.getJSON('/tangbao-db-config/' + dbConfigId + '/tables', function(tables) {
+                $.getJSON('tangbao-db-config/' + dbConfigId + '/tables', function(tables) {
                     var html = '<option value="">-- 请选择表 --</option>';
                     var hasCurrent = false;
                     tables.forEach(function(t) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tangbao-he-db-helper",
-    "version": "1.0.21",
+    "version": "1.0.24",
     "description": "MyBatis-style database helper for Node-RED with CRUD, SQL mapper, and multi-database support",
     "main": "db-config.js",
     "scripts": {