jsql-neo 6.3.5 → 6.3.6

package/README.md

@@ -3,7 +3,7 @@
 > **One engine to rule them all** — a Rust-powered embedded database that speaks your language:
 > MySQL. PostgreSQL. MongoDB. Redis. SQL. TypeScript. The browser. **And it fits in one npm package.**
 
-> **v6.3.5** — official release build · [github.com/vexify-org/JSQL-neo](https://github.com/vexify-org/JSQL-neo)
+> **v6.3.6** — official release build · [github.com/vexify-org/JSQL-neo](https://github.com/vexify-org/JSQL-neo)
 
 ![Engines](https://img.shields.io/badge/engines-Native%20%7C%20WASM%20%7C%20Pure%20JS-7ee787)
 ![MySQL](https://img.shields.io/badge/protocol-MySQL%20compatible-1f6feb)
@@ -1470,7 +1470,7 @@ jsql mod --engine wasm        # switch engine (restart required)
 
 ```bash
 $ jsql version
-jsql-neo v6.3.5
+jsql-neo v6.3.6
 engine: native (napi) | wasm | js
 node: v22.0.0  platform: linux x64
 ```
@@ -1491,7 +1491,7 @@ jsql tui --memory -q                      # memory mode, quiet
 jsql tui --prompt 'db> ' --no-color
 ```
 
-The status bar shows: `db=<name> dialect=<d> mode=<tui|batch> ver=6.3.5`.
+The status bar shows: `db=<name> dialect=<d> mode=<tui|batch> ver=6.3.6`.
 
 ### Keyboard shortcuts
 
@@ -4175,7 +4175,7 @@ Data dir: /root/.jsql-neo/data
 
 ```bash
 $ jsql version
-jsql-neo v6.3.5
+jsql-neo v6.3.6
 engine: native (napi) | wasm | js
 node: v22.0.0
 platform: linux x64
@@ -5275,7 +5275,7 @@ Apache License
 
 *JSQL-NEO — One engine to rule them all. MySQL. PostgreSQL. MongoDB. Redis. SQL. TypeScript. The browser.*
 
-*文档版本：v6.3.5 · 最后更新：2026-09-27*
+*文档版本：v6.3.6 · 最后更新：2026-09-27*
 
 ---
 
@@ -7047,7 +7047,7 @@ Usage: jsql version
 
 输出版本与环境信息：
 
-  jsql-neo v6.3.5
+  jsql-neo v6.3.6
   engine: native (napi) | wasm | js
   node: v22.0.0
   platform: linux x64
@@ -7703,7 +7703,7 @@ CI（GitHub Actions）矩阵：`node 20/22` × `linux/macos/windows` × `native/
 
 *JSQL-NEO — One engine to rule them all. MySQL. PostgreSQL. MongoDB. Redis. SQL. TypeScript. The browser.*
 
-*文档版本：v6.3.5 · 共 19 个附录 · 最后更新：2026-09-27*
+*文档版本：v6.3.6 · 共 19 个附录 · 最后更新：2026-09-27*
 
 ---
 
@@ -8310,4 +8310,4 @@ npm test
 
 *JSQL-NEO — One engine to rule them all. MySQL. PostgreSQL. MongoDB. Redis. SQL. TypeScript. The browser.*
 
-*文档版本：v6.3.5 · 附录 A–Z · 全文 6000+ 行 · 最后更新：2026-09-27*
+*文档版本：v6.3.6 · 附录 A–Z · 全文 6000+ 行 · 最后更新：2026-09-27*

package/index.js

@@ -1,5 +1,5 @@
 /**
- * JSQL-NEO v6.3.5 — Rust-Powered Embedded Database (WASM + HTTP)
+ * JSQL-NEO v6.3.6 — Rust-Powered Embedded Database (WASM + HTTP)
  *
  * @example
  * const jsql = require('jsql-neo');

package/lib/native_client.js

@@ -707,11 +707,41 @@ class JSQL {
     if (!this._runHooks('beforeUpdate', [table, id, data])) return;
     const seq = this._seqIdByPk(table, id);
     if (seq === null) return;
+    // 改主键 / UNIQUE 列前先查冲突（同步版，与 lib/database.js 的修复对齐）。
+    // 此前直接写入，导致 UPDATE t SET id = 1 WHERE id = 2 静默产生两行同主键。
+    this._assertNoKeyConflictSync(table, id, data);
     if (!this._opBuffer.update[table]) this._opBuffer.update[table] = [];
     this._opBuffer.update[table].push([seq, data]);
     this._scheduleOpFlush();
   }
 
+  /** UPDATE 后的主键 / UNIQUE 值是否与其它行冲突（同步检查） */
+  _assertNoKeyConflictSync(table, id, data) {
+    const schema = this._schemas && this._schemas[table];
+    if (!schema) return;
+    const fields = Object.keys(schema).filter(f => schema[f] && (schema[f].primaryKey || schema[f].unique));
+    if (!fields.length) return;
+    const raw = this._n('jsqlFind', table, '{}', 1000000, 0);
+    const all = safeParse(raw);
+    if (!Array.isArray(all)) return;
+    const pk = this._pkOf(table) || 'id';
+    // jsqlFind 返回的行结构是 { id, fields:{...} } —— 值在 fields 里，不在顶层。
+    const valOf = (r, f) => (r && r.fields && typeof r.fields === 'object' ? r.fields[f] : r ? r[f] : undefined);
+    const idOf = (r) => (r && r.fields ? valOf(r, pk) : r ? r[pk] : undefined);
+    for (const f of fields) {
+      if (!Object.prototype.hasOwnProperty.call(data, f)) continue;
+      const nv = data[f];
+      const self = all.find(r => String(idOf(r)) === String(id));
+      if (self && valOf(self, f) === nv) continue;                   // 值没变
+      if (all.some(r => r !== self && valOf(r, f) === nv)) {
+        const e = new Error(`Duplicate entry '${nv}' for key '${f}'`);
+        e.code = 'ER_DUP_ENTRY';
+        e.errno = 1062;
+        throw e;
+      }
+    }
+  }
+
   removeById(table, id) {
     if (!this._runHooks('beforeDelete', [table, id])) return;
     const seq = this._seqIdByPk(table, id);

package/lib/sql.js

@@ -4156,7 +4156,11 @@ class SQLExecutor {
               for (const [col, val] of statement.assignments) {
                 data[col] = typeof val === 'object' && val !== null && val.type ? resolveOperand(val, row, this.ctx) : val;
               }
-              this.engine.updateById(statement.table, id, data);
+              // 必须 await：wasm / native client 的 updateById 是异步的，
+              // 不等就会把「主键/唯一约束冲突」的异常变成未处理的 Promise 拒绝 ——
+              // 表现为 UPDATE 静默成功、产生两行同主键，而调用方拿不到任何错误。
+              // lib/database.js 的实现是同步的，await 同步值同样安全。
+              await this.engine.updateById(statement.table, id, data);
               count++;
             }
           }

package/lib/wasm_client.js

@@ -664,6 +664,12 @@ class JSQL {
     await this._flush();
     const seq = this._seqIdByPk(table, id);
     if (seq === null) return null;
+    // 改主键 / UNIQUE 列前先查冲突。
+    // 此前直接调 jsql_update_by_id，导致
+    //   UPDATE t SET id = 1 WHERE id = 2   （t 已有 id=1）
+    // 静默产生两行同主键 —— 主键索引只留一个，索引与实际行数组不一致。
+    // MySQL / SQLite 都会报 UNIQUE constraint failed。
+    await this._assertNoKeyConflict(table, id, data, seq);
     const r = safeJsonParse(wasmBindings.jsql_update_by_id(table, BigInt(seq), JSON.stringify(data)));
     if (r && r.ok === false) throw new Error(r.error || 'update failed');
     this._emit('update', { table, id, data });
@@ -671,6 +677,35 @@ class JSQL {
     return r;
   }
 
+  /**
+   * 校验 UPDATE 后的主键 / UNIQUE 值不与其它行冲突。
+   * 逐行比对（未建索引也正确）；值未变化时跳过。
+   */
+  async _assertNoKeyConflict(table, id, data, selfSeq) {
+    const schema = this._schemas[table];
+    if (!schema) return;
+    const fields = Object.keys(schema).filter(f => schema[f] && (schema[f].primaryKey || schema[f].unique));
+    if (!fields.length) return;
+    let rows;
+    try {
+      rows = await this.find(table, {}, { limit: 1e9, offset: 0 });
+    } catch (_) {
+      return;   // 读不到就不拦，交给底层报错
+    }
+    for (const f of fields) {
+      if (!Object.prototype.hasOwnProperty.call(data, f)) continue;
+      const nv = data[f];
+      const self = rows.find(r => r && String(r.id) === String(id));
+      if (self && self[f] === nv) continue;             // 值没变
+      if (rows.some(r => r && r !== self && r[f] === nv)) {
+        const e = new Error(`Duplicate entry '${nv}' for key '${f}'`);
+        e.code = 'ER_DUP_ENTRY';
+        e.errno = 1062;
+        throw e;
+      }
+    }
+  }
+
   async removeById(table, id) {
     if (!this._runHooks('beforeDelete', [table, id])) return;
     await this._flush();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsql-neo",
-  "version": "6.3.5",
+  "version": "6.3.6",
   "description": "JSQL-NEO — Rust-powered embedded database with WASM, REST API, B-Tree indexes, WAL, crash recovery",
   "main": "index.js",
   "types": "index.d.ts",

package/test/dml-constraints.test.js

@@ -13,7 +13,7 @@
 const path = require('path');
 
 const ROOT = path.join(__dirname, '..');
-const { Database } = require(path.join(ROOT, 'index.js'));
+const { Database, JSQL, NativeJSQL } = require(path.join(ROOT, 'index.js'));
 const { executeSQL } = require(path.join(ROOT, 'lib/sql.js'));
 
 const OPTS = { safety: false };
@@ -130,6 +130,46 @@ async function t(name, fn) {
     return eq(await rows(`SELECT id, v FROM t ORDER BY id`), [[1, 99], [2, 20]]);
   });
 
+  // 三个 engine 都要拦住 —— 修复曾只加在 lib/database.js，
+  // 而 JSQL（wasm）走 lib/wasm_client.js、NativeJSQL 走 lib/native_client.js，
+  // 各自的 updateById 是独立实现。
+  console.log('\n--- UPDATE 冲突校验：三个 engine 都要拦住 ---');
+  const engines = [
+    ['JSQL(wasm)', () => new JSQL({ mode: 'memory' })],
+    ['NativeJSQL', () => new NativeJSQL({ mode: 'memory' })],
+    ['Database', () => new Database(':memory:')],
+  ];
+  for (const [name, mk] of engines) {
+    await t(`${name} UPDATE 主键冲突 → 报错且数据完好`, async () => {
+      const db = await mk();
+      if (db.start) await db.start();
+      try {
+        const exec = (sql) => executeSQL(db, sql, OPTS);
+        await exec(`CREATE TABLE e (id INT PRIMARY KEY, v INT)`);
+        await exec(`INSERT INTO e VALUES (1,10),(2,20),(3,30)`);
+        let threw = false;
+        try { await exec(`UPDATE e SET id = 1 WHERE id = 2`); } catch (_) { threw = true; }
+        const after = (await exec(`SELECT id, v FROM e ORDER BY id`)).rows;
+        // 改不冲突的值必须仍然可用
+        await exec(`UPDATE e SET id = 9 WHERE id = 2`);
+        const ok = (await exec(`SELECT id FROM e ORDER BY id`)).rows;
+        return threw && eq(after, [[1, 10], [2, 20], [3, 30]]) && eq(ok, [[1], [3], [9]]);
+      } finally { try { await db.stop(); } catch (_) { /* ignore */ } }
+    });
+    await t(`${name} UPDATE UNIQUE 冲突 → 报错`, async () => {
+      const db = await mk();
+      if (db.start) await db.start();
+      try {
+        const exec = (sql) => executeSQL(db, sql, OPTS);
+        await exec(`CREATE TABLE q (id INT PRIMARY KEY, e TEXT UNIQUE)`);
+        await exec(`INSERT INTO q VALUES (1,'a'),(2,'b')`);
+        let threw = false;
+        try { await exec(`UPDATE q SET e = 'a' WHERE id = 2`); } catch (_) { threw = true; }
+        return threw && eq((await exec(`SELECT e FROM q ORDER BY id`)).rows, [['a'], ['b']]);
+      } finally { try { await db.stop(); } catch (_) { /* ignore */ } }
+    });
+  }
+
   console.log('\n--- 既有约束行为回归对照 ---');
   await t('INSERT 主键重复 → 报错', async ({ exec, mustFail }) => {
     await exec(`CREATE TABLE t (id INT PRIMARY KEY)`);