jsql-neo 6.4.7 → 6.4.9

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, **and the browser**.
 
-> **v6.4.7** — official release build · [github.com/vexify-org/JSQL-neo](https://github.com/vexify-org/JSQL-neo) · [jsql.vexify.top](https://jsql.vexify.top)
+> **v6.4.9** — official release build · [github.com/vexify-org/JSQL-neo](https://github.com/vexify-org/JSQL-neo) · [jsql.vexify.top](https://jsql.vexify.top)
 
 ![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)

package/index.js

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

package/lib/native_client.js

@@ -802,6 +802,14 @@ class JSQL {
     if (!schema) return;
     const fields = Object.keys(schema).filter(f => schema[f] && (schema[f].primaryKey || schema[f].unique));
     if (!fields.length) return;
+    // 只在**确实要改主键 / UNIQUE 列**时才做冲突检查。
+    //   UPDATE t SET age = 30 WHERE id = 1 —— age 不是主键，不可能造成键冲突。
+    //
+    // 此前先把整表 jsqlFind 一遍（limit 1000000 = 20 万行全量 JSON 化），再进
+    // 循环逐字段 find/some。updateById 于是在 20 万行的表上要 250~500ms ——
+    // 比读整张表还贵，而它本来只需要定位一行。
+    const touched = fields.filter(f => Object.prototype.hasOwnProperty.call(data, f));
+    if (!touched.length) return;
     const raw = this._n('jsqlFind', table, '{}', 1000000, 0);
     const all = safeParse(raw);
     if (!Array.isArray(all)) return;

package/lib/table.js

@@ -146,6 +146,20 @@ class Table {
         this._dateFields = {};       // { fieldName: 'date'|'datetime'|'timestamp' }
 
         for (const [field, def] of Object.entries(schema)) {
+            // schema 字段名归一化：驼峰 primaryKey/autoIncrement 与下划线
+            // primary_key/auto_increment 两种写法都要认。
+            //
+            // 此前这里只认驼峰，而 native_client 在交给 Rust 之前会归一化
+            // （lib/native_client.js 里 primary_key → primaryKey）。结果：
+            // README 与官方示例用的下划线写法，在 native 下正常，在纯 JS 下
+            // **静默失效** —— 自增 id 不生成，find({id:1}) 永远返回空，
+            // 而且不报任何错。这是纯 JS 与 native 的行为分歧。
+            if (def && typeof def === 'object' && !Array.isArray(def)) {
+                if (def.primary_key !== undefined && def.primaryKey === undefined) def.primaryKey = def.primary_key;
+                if (def.auto_increment !== undefined && def.autoIncrement === undefined) def.autoIncrement = def.auto_increment;
+                if (def.primary_key !== undefined) delete def.primary_key;
+                if (def.auto_increment !== undefined) delete def.auto_increment;
+            }
             const isPk = !!(def.primaryKey || def.primary === true);
             if (isPk) this._primaryKey = field;
             if (def.autoIncrement) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsql-neo",
-  "version": "6.4.7",
+  "version": "6.4.9",
   "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/native.test.js

@@ -151,6 +151,43 @@ function ok(name, cond, extra) {
     await db.stop();
   }
 
+/* ---- schema 字段名下划线写法：两引擎必须一致（静默正确性 bug）---- */
+/*
+ * README 与官方示例用下划线写法（primary_key / auto_increment）。
+ * native_client 交给 Rust 前会归一化，纯 JS 的 table.js 此前不认 ——
+ * 结果纯 JS 下自增 id 根本不生成、find({id:1}) 永远空，且**不报任何错**。
+ */
+{
+  const SNAKE = { id: { type: 'integer', primary_key: true, auto_increment: true }, name: { type: 'string' } };
+
+  // native
+  {
+    const d = new JSQL();
+    await d.start();
+    await d.createTable('snk', SNAKE);
+    await d.insert('snk', [{ name: 'a' }, { name: 'b' }]);
+    await new Promise(r => setTimeout(r, 200));
+    const rows = await d.find('snk', {});
+    const first = rows.find(r => r.name === 'a');
+    ok('schema 下划线写法 · native：自增 id 生成', !!(first && first.id !== undefined), rows);
+    const got = await d.findById('snk', first && first.id);
+    ok('schema 下划线写法 · native：findById 命中', !!(got && got.name === 'a'), got);
+    await d.stop();
+  }
+
+  // pure JS
+  {
+    const Database = require(path.join(ROOT, 'lib', 'database'));
+    const d = new Database(':memory:');
+    await d.createTable('snk', SNAKE);
+    await d.insert('snk', [{ name: 'a' }, { name: 'b' }]);
+    const rows = await d.find('snk', {});
+    const first = rows.find(r => r.name === 'a');
+    ok('schema 下划线写法 · pure-js：自增 id 生成', !!(first && first.id !== undefined), rows);
+    const got = await d.findById('snk', first && first.id);
+    ok('schema 下划线写法 · pure-js：findById 命中', !!(got && got.name === 'a'), got);
+  }
+}
   console.log(`\n${passed} passed, ${failed} failed`);
   process.exit(failed ? 1 : 0);
 })().catch(e => {