jsql-neo 6.0.2 → 6.0.4

package/nativesrc/jsql-neo-native/Cargo.lock

@@ -205,7 +205,7 @@ dependencies = [
 
 [[package]]
 name = "jsql-neo-core"
-version = "5.6.0"
+version = "6.0.0"
 dependencies = [
  "bincode",
  "chrono",
@@ -220,7 +220,7 @@ dependencies = [
 
 [[package]]
 name = "jsql-neo-native"
-version = "5.6.0"
+version = "6.0.0"
 dependencies = [
  "jsql-neo-core",
  "napi",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsql-neo",
-  "version": "6.0.2",
+  "version": "6.0.4",
   "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/readme-audit.test.js

@@ -139,6 +139,88 @@ async function main() {
       JSON.stringify(await rowsOf('SELECT name FROM (SELECT name, sal FROM emp WHERE sal > 150)')) === '[["b"],["c"],["d"]]');
   }
 
+  console.log('\n--- 方言特性：DIV / XOR / && / || / <=> / :: / -> ->> / LIKE ESCAPE ---');
+  {
+    const data = [
+      { id: 1, n: 10, flag: 1, s: '100%', nm: 'Alice', meta: '{"name":"Alice","addr":{"city":"SH"},"tags":["x","y"]}' },
+      { id: 2, n: 20, flag: 0, s: '1000', nm: 'Bob', meta: '{"name":"Bob","addr":{"city":"BJ"},"tags":[]}' },
+      { id: 3, n: 30, flag: 1, s: '100', nm: 'Cara', meta: null },
+    ];
+    const engine = {
+      hasTable: () => true, truncate: async () => {}, flush: async () => {},
+      find: async () => data.map(r => ({ ...r })),
+      getTableSchema: async () => ({
+        id: { type: 'integer', primaryKey: true }, n: { type: 'integer' }, flag: { type: 'integer' },
+        s: { type: 'string' }, nm: { type: 'string' }, meta: { type: 'json' },
+      }),
+    };
+    const rowsOf = async (sql) => {
+      const r = await executeSQL(engine, sql, OPTS);
+      return (Array.isArray(r) ? r[0] : r).rows;
+    };
+
+    ok('DIV 整数除法', JSON.stringify(await rowsOf('SELECT 7 DIV 2 AS r')) === '[[3]]');
+    ok('DIV 负数向零取整', JSON.stringify(await rowsOf('SELECT -7 DIV 2 AS r')) === '[[-3]]');
+    ok("'5'::INT 类型转换", JSON.stringify(await rowsOf("SELECT '5'::INT AS r")) === '[[5]]');
+    ok('XOR 逻辑异或（WHERE）',
+      JSON.stringify(await rowsOf('SELECT id FROM tbl WHERE flag = 1 XOR n = 20')) === '[[1],[2],[3]]');
+    ok('&& 是 AND 别名',
+      JSON.stringify(await rowsOf('SELECT id FROM tbl WHERE flag = 1 && n > 10')) === '[[3]]');
+    ok('|| 是 OR 别名',
+      JSON.stringify(await rowsOf('SELECT id FROM tbl WHERE flag = 0 || n > 20')) === '[[2],[3]]');
+    ok('<=> 非空相等', JSON.stringify(await rowsOf('SELECT id FROM tbl WHERE n <=> 20')) === '[[2]]');
+    ok('<=> NULL 安全（NULL<=>NULL 为真）',
+      JSON.stringify(await rowsOf('SELECT id FROM tbl WHERE meta <=> NULL')) === '[[3]]');
+    ok("->>'name'", JSON.stringify(await rowsOf("SELECT meta->>'name' AS x FROM tbl WHERE id = 1")) === '[["Alice"]]');
+    ok("->'addr'->>'city' 链式",
+      JSON.stringify(await rowsOf("SELECT meta->'addr'->>'city' AS x FROM tbl WHERE id = 1")) === '[["SH"]]');
+    ok("->'tags'->>0 数组下标",
+      JSON.stringify(await rowsOf("SELECT meta->'tags'->>0 AS x FROM tbl WHERE id = 1")) === '[["x"]]');
+    // PG JSON 包含 / 路径操作符
+    ok("meta @> '{...}' 包含",
+      JSON.stringify(await rowsOf(`SELECT id FROM tbl WHERE meta @> '{"addr":{"city":"SH"}}'`)) === '[[1]]');
+    ok("'{...}' <@ meta 被包含",
+      JSON.stringify(await rowsOf(`SELECT id FROM tbl WHERE '{"name":"Bob"}' <@ meta`)) === '[[2]]');
+    ok("meta#>'{addr,city}' 路径",
+      JSON.stringify(await rowsOf("SELECT meta#>'{addr,city}' AS x FROM tbl WHERE id = 1")) === '[["SH"]]');
+    ok("meta#>>'{addr,city}' 路径文本",
+      JSON.stringify(await rowsOf("SELECT meta#>>'{addr,city}' AS x FROM tbl WHERE id = 1")) === '[["SH"]]');
+    ok("meta#>'{tags,0}' 路径含下标",
+      JSON.stringify(await rowsOf("SELECT meta#>'{tags,0}' AS x FROM tbl WHERE id = 1")) === '[["x"]]');
+    // JSON 键存在 ? / ?| / ?&
+    ok("meta ? 'name'", JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE meta ? 'name'")) === '[[1],[2]]');
+    ok("meta ? 'nope'（不存在）",
+      JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE meta ? 'nope'")) === '[]');
+    ok("meta ?| '{name,nope}'（任一）",
+      JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE meta ?| '{name,nope}'")) === '[[1],[2]]');
+    ok("meta ?& '{name,addr}'（全部）",
+      JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE meta ?& '{name,addr}'")) === '[[1],[2]]');
+    ok("meta ?& '{name,nope}'（缺一个）",
+      JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE meta ?& '{name,nope}'")) === '[]');
+    // PG 正则：~ 敏感 / ~* 不敏感 / !~ 取反
+    ok("nm ~ '^A' 大小写敏感", JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE nm ~ '^A'")) === '[[1]]');
+    ok("nm ~* '^a' 不敏感", JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE nm ~* '^a'")) === '[[1]]');
+    ok("nm !~ '^A' 取反", JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE nm !~ '^A'")) === '[[2],[3]]');
+    ok('REGEXP 仍可用', JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE nm REGEXP '^A'")) === '[[1]]');
+    ok("LIKE ... ESCAPE '!' 匹配字面量 %",
+      JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE s LIKE '100!%' ESCAPE '!'")) === '[[1]]');
+    ok('LIKE 反斜杠转义匹配字面量 %',
+      JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE s LIKE '100\\%'")) === '[[1]]');
+    ok('LIKE 普通 % 仍为通配',
+      JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE s LIKE '100%'")) === '[[1],[2],[3]]');
+
+    // 参数绑定：位置 ? / 命名 :name / 编号 $1（README「Params」一节）
+    const rowsOfP = async (sql, params) => {
+      const r = await executeSQL(engine, sql, params, OPTS);
+      return (Array.isArray(r) ? r[0] : r).rows;
+    };
+    ok('位置参数 ?', JSON.stringify(await rowsOfP('SELECT id FROM tbl WHERE id = ?', [1])) === '[[1]]');
+    ok('命名参数 :id', JSON.stringify(await rowsOfP('SELECT id FROM tbl WHERE id = :id', { id: 2 })) === '[[2]]');
+    ok('命名参数多占位', JSON.stringify(await rowsOfP('SELECT id FROM tbl WHERE id = :a OR id = :b', { a: 1, b: 3 })) === '[[1],[3]]');
+    ok('编号参数 $1', JSON.stringify(await rowsOfP('SELECT id FROM tbl WHERE id = $1', [3])) === '[[3]]');
+    ok('编号参数 $2/$1', JSON.stringify(await rowsOfP('SELECT id FROM tbl WHERE id = $2 OR id = $1', [1, 2])) === '[[1],[2]]');
+  }
+
   console.log('\n--- DDL / 解析器节点覆盖 ---');
   {
     ok('CREATE INDEX 可解析', parseSQL('CREATE INDEX i ON t (a)').type === 'createIndex');
@@ -156,6 +238,30 @@ async function main() {
       const st = parseSQL('CREATE TABLE t (id INT PRIMARY KEY, c DATETIME DEFAULT CURRENT_TIMESTAMP)');
       return st.schema.c.default === 'CURRENT_TIMESTAMP';
     })());
+    ok('SERIAL 折叠为整型+自增', (() => {
+      const st = parseSQL('CREATE TABLE t (id SERIAL PRIMARY KEY, n TEXT)');
+      return st.schema.id.type === 'integer' && st.schema.id.autoIncrement === true;
+    })());
+    ok('BIGSERIAL 折叠为整型+自增', (() => {
+      const st = parseSQL('CREATE TABLE t (id BIGSERIAL PRIMARY KEY)');
+      return st.schema.id.type === 'integer' && st.schema.id.autoIncrement === true;
+    })());
+  }
+
+  console.log('\n--- executeSQL 结果信封（README 承诺的字段）---');
+  {
+    const engine = {
+      hasTable: () => true, truncate: async () => {}, flush: async () => {},
+      find: async () => [{ id: 1, name: 'a' }, { id: 2, name: 'b' }],
+      getTableSchema: async () => ({ id: { type: 'integer', primaryKey: true }, name: { type: 'string' } }),
+    };
+    const r = await executeSQL(engine, 'SELECT * FROM t', OPTS);
+    for (const f of ['columns', 'columnTypes', 'rows', 'rowCount', 'affectedRows', 'message', 'command', 'durationMs', 'warnings']) {
+      ok(`信封含 ${f}`, r[f] !== undefined, Object.keys(r));
+    }
+    ok('rowCount = 2', r.rowCount === 2);
+    ok('command = SELECT', r.command === 'SELECT');
+    ok('columnTypes 可推断（id → INT）', Array.isArray(r.columnTypes) && r.columnTypes[0] === 'INT');
   }
 
   console.log('\n--- 顶层工厂导出不得为 undefined ---');
@@ -214,29 +320,32 @@ async function main() {
 
   console.log('\n--- 并发 insert 不得重复写（曾行数暴涨 / 丢失）---');
   {
-    const { JSQL } = require('../lib/wasm_client.js');
-    let db;
-    try {
-      db = new JSQL();
-      await db.start();
-    } catch (e) {
-      console.log('[SKIP] WASM 客户端不可用：' + e.message.slice(0, 60));
-    }
-    if (db) {
+    // 两个引擎都要验收：曾只测 wasm，导致 native（默认引擎）的同款竞态长期漏网。
+    for (const engineName of ['wasm_client', 'native_client']) {
+      let JSQL, db;
+      try {
+        ({ JSQL } = require('../lib/' + engineName + '.js'));
+        db = new JSQL();
+        await db.start();
+      } catch (e) {
+        console.log(`[SKIP] ${engineName} 不可用：` + e.message.slice(0, 60));
+        continue;
+      }
+      const tag = `[${engineName}]`;
       let id = 0;
       await db.createTable('conc', { id: { type: 'INT', primaryKey: true }, b: { type: 'INT' } });
       await Promise.all(Array.from({ length: 200 }, () => db.insert('conc', { id: ++id, b: 5 })));
       const cnt = await db.count('conc');
-      ok(`并发 insert 200 行 → count 恰为 200（实际 ${cnt}）`, cnt === 200);
+      ok(`${tag} 并发 insert 200 行 → count 恰为 200（实际 ${cnt}）`, cnt === 200);
 
       // flush 失败不得把坏行留在 buffer 里二次爆炸
-      ok('insert(null) 抛 TypeError', await (async () => {
+      ok(`${tag} insert(null) 抛 TypeError`, await (async () => {
         try { await db.insert('conc', null); return false; } catch (e) { return e instanceof TypeError; }
       })());
-      ok('insert(undefined) 抛 TypeError', await (async () => {
+      ok(`${tag} insert(undefined) 抛 TypeError`, await (async () => {
         try { await db.insert('conc', undefined); return false; } catch (e) { return e instanceof TypeError; }
       })());
-      ok('insert(非对象) 抛 TypeError', await (async () => {
+      ok(`${tag} insert(非对象) 抛 TypeError`, await (async () => {
         try { await db.insert('conc', 42); return false; } catch (e) { return e instanceof TypeError; }
       })());
 
@@ -246,13 +355,43 @@ async function main() {
       cyc.self = cyc;
       let cycErr = null;
       try { await db.insert('cyc', { id: 1, meta: cyc }); } catch (e) { cycErr = e; }
-      ok('环形对象给出带表/列名的错误',
+      ok(`${tag} 环形对象给出带表/列名的错误`,
         !!cycErr && /Cannot serialize column 'meta'/.test(cycErr.message),
         cycErr && cycErr.message);
       await db.stop();
     }
   }
 
+  console.log('\n--- 唯一约束：非主键 UNIQUE 必须报 ER_DUP_ENTRY ---');
+  {
+    let JSQL, db;
+    try {
+      ({ JSQL } = require('../lib/native_client.js'));
+      db = new JSQL();
+      await db.start();
+    } catch (e) {
+      console.log('[SKIP] native 不可用：' + e.message.slice(0, 60));
+    }
+    if (db) {
+      const run = (sql) => executeSQL(db, sql, OPTS);
+      const dupErrMsg = async (sql) => {
+        try { await run(sql); return null; } catch (e) { return e.message; }
+      };
+      await run('CREATE TABLE u (id SERIAL PRIMARY KEY, email TEXT UNIQUE, nick TEXT UNIQUE)');
+      await run("INSERT INTO u (email, nick) VALUES ('a@x.com', 'a')");
+      ok('唯一列重复 → ER_DUP_ENTRY',
+        /ER_DUP_ENTRY/.test(await dupErrMsg("INSERT INTO u (email, nick) VALUES ('a@x.com', 'z')") || ''));
+      ok('批内唯一重复 → ER_DUP_ENTRY',
+        /ER_DUP_ENTRY/.test(await dupErrMsg("INSERT INTO u (email, nick) VALUES ('b@x.com', 'n1'), ('c@x.com', 'n1')") || ''));
+      const r1 = await run('SELECT id FROM u');
+      ok('冲突后仍只有 1 行', r1.rows.length === 1, r1.rows);
+      await run("INSERT INTO u (email, nick) VALUES (NULL, 'x'), (NULL, 'y')");
+      const r2 = await run('SELECT id FROM u');
+      ok('UNIQUE 允许多个 NULL', r2.rows.length === 3, r2.rows);
+      await db.stop();
+    }
+  }
+
   console.log('\n--- Redis：RESP2 帧解析（曾 inline 命令恒为 unknown command）---');
   {
     const { RedisServer } = require('../lib/redis_server.js');