jsql-neo 6.5.25 → 6.5.26

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.5.25** — stable release · [github.com/vexify-org/JSQL-neo](https://github.com/vexify-org/JSQL-neo) · [jsql.vexify.top](https://jsql.vexify.top)
+> **v6.5.26** — stable release · [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.5.25 — Rust-Powered Embedded Database (WASM + HTTP)
+ * JSQL-NEO v6.5.26 — Rust-Powered Embedded Database (WASM + HTTP)
  *
  * @example
  * const jsql = require('jsql-neo');

package/lib/sql.js

@@ -8263,6 +8263,31 @@ function buildResultEnvelope(stmt, r, durationMs) {
       : (typeof out.affectedRows === 'number' ? out.affectedRows : 0);
   }
   if (out.warnings === undefined) out.warnings = [];
+  /*
+   * result.raw 的原始契约：与 columns / rows 指向**同一份**结果，只是对象形式。
+   *
+   * 证据在 lib/prepared.js 的 get()：raw 缺失时它会用 columns + rows[0]
+   * 现场拼出等价对象 —— 说明 raw 本就该是「columns × rows 的 zip」。
+   *
+   * 但 executeSelect 的多个分支直接把「投影前的源行」塞进 raw
+   * （rows: mapped, raw: rows）。于是聚合 / 计算列 / 无 FROM 查询里，
+   * raw 变成 undefined、{_virtual:true}，或是缺了计算列的源行对象
+   * （GROUP BY 还会泄露内部 _group）。见 issue #43。
+   *
+   * 与其逐个分支改，不如在统一出口兑现契约：只要结果是 SELECT 且有
+   * columns + rows，就从投影后的元组重建对象形式。非元组行保持原样。
+   */
+  if (t === 'select' && Array.isArray(out.columns) && Array.isArray(out.rows)) {
+    const cols = out.columns;
+    out.raw = out.rows.map((row, i) => {
+      if (!Array.isArray(row)) {
+        return (Array.isArray(out.raw) && out.raw[i] !== undefined) ? out.raw[i] : row;
+      }
+      const obj = {};
+      for (let j = 0; j < cols.length; j++) obj[cols[j]] = row[j];
+      return obj;
+    });
+  }
   if (out.durationMs === undefined) out.durationMs = durationMs;
   if (out.message === undefined) {
     out.message = t === 'select'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsql-neo",
-  "version": "6.5.25",
+  "version": "6.5.26",
   "description": "JSQL-NEO \u2014 Rust-powered embedded database with WASM, REST API, B-Tree indexes, WAL, crash recovery",
   "main": "index.js",
   "types": "index.d.ts",
@@ -50,12 +50,12 @@
   "scripts": {
     "postinstall": "node postinstall.js",
     "build:native": "node scripts/build-native.js",
-    "test": "node test/smoke.js && node test/native.test.js && node test/json-functions.test.js && node test/sql-parser.test.js && node test/readme-audit.test.js && node test/query-opt.test.js && node test/wal-recovery.test.js && node test/mysql-compat-hijack.test.js && node test/dml-constraints.test.js && node test/star-nag.test.js && node test/plugin-xql.test.js && node test/bug-regression-2.test.js && node test/issue-34-35-36.test.js && node test/issue-g4.test.js && node test/issue-38.test.js && node test/issue-39.test.js && node test/issue-40.test.js",
+    "test": "node test/smoke.js && node test/result-raw.test.js && node test/native.test.js && node test/json-functions.test.js && node test/sql-parser.test.js && node test/readme-audit.test.js && node test/query-opt.test.js && node test/wal-recovery.test.js && node test/mysql-compat-hijack.test.js && node test/dml-constraints.test.js && node test/star-nag.test.js && node test/plugin-xql.test.js && node test/bug-regression-2.test.js && node test/issue-34-35-36.test.js && node test/issue-g4.test.js && node test/issue-38.test.js && node test/issue-39.test.js && node test/issue-40.test.js",
     "test:parser": "node test/sql-parser.test.js",
     "test:btree": "node test/btree.test.js",
     "test:native": "node test/native.test.js",
     "test:regress": "node test/regress-5.1.0.js",
-    "test:all": "node test/smoke.js && node test/sql-parser.test.js && node test/readme-audit.test.js && node test/native.test.js && node test/native-multi-instance.test.js && node test/wal-recovery.test.js && node test/mysql-compat-hijack.test.js && node test/wasm.test.js && node test/coverage.js && node test/regress-5.1.0.js && node test/join.test.js && node test/btree.test.js && node test/dml-constraints.test.js && node test/savepoint.test.js && node test/alter-table.test.js && node test/null-semantics.test.js && node test/identifier-keywords.test.js && node test/issue-34-35-36.test.js && node test/sql-semantics.test.js && node test/extra-coverage.test.js && node test/filter-compile.test.js && node test/recursive-cte.test.js && node test/index-ddl.test.js && node test/mongo-group.test.js && node test/multiprotocol.test.js && node test/issue-g4.test.js && node test/issue-38.test.js && node test/issue-39.test.js && node test/issue-40.test.js",
+    "test:all": "node test/smoke.js && node test/result-raw.test.js && node test/sql-parser.test.js && node test/readme-audit.test.js && node test/native.test.js && node test/native-multi-instance.test.js && node test/wal-recovery.test.js && node test/mysql-compat-hijack.test.js && node test/wasm.test.js && node test/coverage.js && node test/regress-5.1.0.js && node test/join.test.js && node test/btree.test.js && node test/dml-constraints.test.js && node test/savepoint.test.js && node test/alter-table.test.js && node test/null-semantics.test.js && node test/identifier-keywords.test.js && node test/issue-34-35-36.test.js && node test/sql-semantics.test.js && node test/extra-coverage.test.js && node test/filter-compile.test.js && node test/recursive-cte.test.js && node test/index-ddl.test.js && node test/mongo-group.test.js && node test/multiprotocol.test.js && node test/issue-g4.test.js && node test/issue-38.test.js && node test/issue-39.test.js && node test/issue-40.test.js",
     "test:coverage": "c8 --all --include='lib/**' --exclude='lib/web_ui.js' --reporter=text --reporter=lcov node test/coverage.js",
     "test:orms": "node examples/orms/run-all.js",
     "test:dml": "node test/dml-constraints.test.js",

package/test/result-raw.test.js

@@ -0,0 +1,93 @@
+/* ---- result.raw：对象形式必须与 columns / rows 指向同一份结果 ---- */
+/*
+ * 原始契约的证据在 lib/prepared.js 的 get()：raw 缺失时它会用
+ * columns + rows[0] 现场拼出等价对象。也就是说 raw 本该是
+ * 「columns × rows 的 zip」，而不是投影前的源行。
+ *
+ * 此前 executeSelect 各分支直接把源行塞进 raw（rows: mapped, raw: rows），
+ * 于是聚合 / 计算列 / 无 FROM 查询里 raw 变成 undefined、{_virtual:true}，
+ * 或是缺了计算列的源行对象，GROUP BY 还会泄露内部 _group。见 issue #43。
+ *
+ * 修复在 buildResultEnvelope（统一出口）重建 raw。这里把六种场景钉死，
+ * 并额外断言「键集合恰好等于 columns」——防止内部字段再漏出来。
+ */
+const path = require('path');
+const ROOT = path.join(__dirname, '..');
+const { Database } = require(path.join(ROOT, 'index.js'));
+
+let pass = 0, fail = 0;
+function ok(name, cond, got) {
+  if (cond) { pass++; console.log('[OK]   ' + name); }
+  else { fail++; console.log('[FAIL] ' + name + ' -> ' + JSON.stringify(got)); }
+}
+
+(async () => {
+  const db = new Database(':memory:');
+  await db.createTable('users', {
+    id: 'integer primary key auto_increment',
+    name: 'string', age: 'integer', city: 'string',
+  });
+  await db.insert('users', [
+    { name: 'Alice', age: 30, city: 'NY' },
+    { name: 'Bob', age: 25, city: 'LA' },
+    { name: 'Carol', age: 40, city: 'NY' },
+  ]);
+
+  // 每个用例同时验三件事：raw 的值、与 rows 等长、键集合恰好是 columns
+  async function check(label, sql, expected) {
+    const r = await db.query(sql);
+    const got = r.raw;
+    ok(label + ' · raw 内容', JSON.stringify(got) === JSON.stringify(expected), got);
+    ok(label + ' · raw 与 rows 等长',
+      Array.isArray(got) && got.length === r.rows.length,
+      { rawLen: got && got.length, rowsLen: r.rows.length });
+    const keysMatch = Array.isArray(got) && got.every((obj) => {
+      if (!obj || typeof obj !== 'object') return false;
+      const keys = Object.keys(obj).sort();
+      const cols = (r.columns || []).slice().sort();
+      return JSON.stringify(keys) === JSON.stringify(cols);
+    });
+    ok(label + ' · 键集合恰好等于 columns', keysMatch,
+      { raw: got && got[0] && Object.keys(got[0]), columns: r.columns });
+  }
+
+  await check('纯聚合',
+    'SELECT COUNT(*) AS c, SUM(age) AS s FROM users',
+    [{ c: 3, s: 95 }]);
+  await check('GROUP BY 聚合',
+    'SELECT city, COUNT(*) c FROM users GROUP BY city ORDER BY city',
+    [{ city: 'LA', c: 1 }, { city: 'NY', c: 2 }]);
+  await check('无 FROM 表达式',
+    'SELECT 1/0 AS z', [{ z: null }]);
+  await check('标量子查询',
+    'SELECT (SELECT MAX(age) FROM users) AS m', [{ m: 40 }]);
+  await check('CASE 计算列',
+    "SELECT name, CASE WHEN age>35 THEN 'senior' END AS tier FROM users WHERE name='Bob'",
+    [{ name: 'Bob', tier: null }]);
+  await check('算术计算列',
+    "SELECT name, age*2 AS dbl FROM users WHERE name='Bob'",
+    [{ name: 'Bob', dbl: 50 }]);
+  await check('普通 SELECT *',
+    "SELECT * FROM users WHERE name='Bob'",
+    [{ id: 2, name: 'Bob', age: 25, city: 'LA' }]);
+
+  // 内部字段不能漏进公开结果（issue #43 里 _group 泄露）
+  const g = await db.query('SELECT city, COUNT(*) c FROM users GROUP BY city');
+  ok('GROUP BY raw 不泄露 _group',
+    Array.isArray(g.raw) && g.raw.every((o) => !Object.keys(o).some((k) => k.startsWith('_'))),
+    g.raw);
+
+  // prepared.get() 的原始 fallback 与 raw 必须等价
+  const p = db.prepare('SELECT COUNT(*) AS c FROM users');
+  const one = await p.get();
+  const q = await db.query('SELECT COUNT(*) AS c FROM users');
+  ok('prepare().get() 与 raw[0] 一致',
+    JSON.stringify(one) === JSON.stringify(q.raw[0]),
+    { get: one, raw0: q.raw[0] });
+
+  console.log(`\n${pass} passed, ${fail} failed`);
+  process.exit(fail === 0 ? 0 : 1);
+})().catch((e) => {
+  console.log('[FAIL] unexpected exception: ' + e.message);
+  process.exit(1);
+});