jsql-neo 5.1.3 → 5.2.0

package/README.md

@@ -13,8 +13,6 @@
 
 ## Why JSQL-NEO?
 
-My web ： https://jsql.vexify.top/
-
 Most embedded databases make you choose: *native speed*, *portable WASM*, or *a familiar file format*.
 JSQL-NEO gives you **all three in one install** — plus drop-in compatibility with the **two most popular
 database protocols in the world**.

package/lib/query.js

@@ -537,7 +537,7 @@ class Query {
                 const key = fr[join.foreignField];
                 const matches = localRows.filter(lr => lr[join.localField] === key);
                 if (matches.length === 0) {
-                    result.push(this._rightNullRow(localRows, fr, join));
+                    result.push({ ...fr, ...this._nullRow(join, true) });
                 } else {
                     for (const lr of matches) {
                         result.push(this._mergeJoinRow(lr, fr, join));
@@ -582,7 +582,7 @@ class Query {
             for (const fr of foreignRows) {
                 const matches = localRows.filter(lr => lr[join.localField] === fr[join.foreignField]);
                 if (matches.length === 0) {
-                    result.push(this._rightNullRow(localRows, fr, join));
+                    result.push({ ...fr, ...this._nullRow(join, true) });
                 } else {
                     for (const lr of matches) {
                         result.push(this._mergeJoinRow(lr, fr, join));
@@ -621,24 +621,6 @@ class Query {
         return nulls;
     }
 
-    /**
-     * RIGHT JOIN 未匹配右表行：保留右表数据，本地表字段填 null。
-     * 返回 { localNulls, merged }，其中 merged = { ...nulls, ...fr }
-     */
-    _rightNullRow(localRows, foreignRow, join) {
-        const localSchema = this._table._schema || {};
-        const localNulls = {};
-        for (const field of Object.keys(localSchema)) {
-            if (field !== '_softDelete') localNulls[field] = null;
-        }
-        const prefix = join.as ? join.as + '_' : '';
-        const foreignPrefixed = {};
-        for (const [key, value] of Object.entries(foreignRow)) {
-            foreignPrefixed[prefix + key] = value;
-        }
-        return { ...localNulls, ...foreignPrefixed };
-    }
-
     // ============================================================
     // 内部: 排序
     // ============================================================

package/lib/sql.js

@@ -261,18 +261,12 @@ class Parser {
     if (this.peek().type === 'op' && this.peek().value === '.') {
       this.next();
       const t2 = this.next();
-      if (t2.type !== 'ident' && !(t2.type === 'keyword' && this._isSchemaView(t2.value))) {
-        throw new Error(`Expected table name after '.', got '${t2.value}'`);
-      }
+      if (t2.type !== 'ident') throw new Error(`Expected table name after '.', got '${t2.value}'`);
       return t.value + '.' + t2.value;
     }
     return t.value;
   }
 
-  _isSchemaView(v) {
-    return ['TABLES', 'COLUMNS', 'SCHEMATA', 'STATISTICS', 'KEY_COLUMN_USAGE', 'REFERENTIAL_CONSTRAINTS', 'TABLE_CONSTRAINTS', 'VIEWS'].includes(String(v).toUpperCase());
-  }
-
   parseCreateTable() {
     this.expectKeyword('CREATE');
     this.expectKeyword('TABLE');
@@ -1876,12 +1870,11 @@ class SQLExecutor {
         const schema = this.engine.getTableSchema
           ? await this.engine.getTableSchema(statement.table)
           : (this.engine._schemas ? this.engine._schemas[statement.table] : null);
-        const pkCols = schema ? Object.keys(schema).filter(k => schema[k].primaryKey) : [];
         const all = (await this.engine.find(statement.table, {}, { limit: 1e9, offset: 0 })).map(r => normalizeRow(r, schema));
         let count = 0;
         for (const row of all) {
           if (!statement.where || evaluateExpr(statement.where, row, this.ctx)) {
-            const id = this._rowPkId(row, pkCols);
+            const id = row._rid !== undefined ? row._rid : row.id;
             if (id !== undefined) {
               const data = {};
               for (const [col, val] of statement.assignments) {
@@ -1899,12 +1892,11 @@ class SQLExecutor {
         const schema = this.engine.getTableSchema
           ? await this.engine.getTableSchema(statement.table)
           : (this.engine._schemas ? this.engine._schemas[statement.table] : null);
-        const pkCols = schema ? Object.keys(schema).filter(k => schema[k].primaryKey) : [];
         const all = (await this.engine.find(statement.table, {}, { limit: 1e9, offset: 0 })).map(r => normalizeRow(r, schema));
         const ids = [];
         for (const row of all) {
           if (!statement.where || evaluateExpr(statement.where, row, this.ctx)) {
-            const id = this._rowPkId(row, pkCols);
+            const id = row._rid !== undefined ? row._rid : row.id;
             if (id !== undefined) ids.push(id);
           }
         }
@@ -2174,19 +2166,6 @@ class SQLExecutor {
     return schema;
   }
 
-  /**
-   * 取行的行 ID：优先内部 _rid，否则用实际主键字段值（不再硬编码 id）。
-   */
-  _rowPkId(row, pkCols) {
-    if (row && row._rid !== undefined) return row._rid;
-    if (pkCols.length > 0) {
-      for (const c of pkCols) {
-        if (row[c] !== undefined && row[c] !== null) return row[c];
-      }
-    }
-    return row ? row.id : undefined;
-  }
-
   async _readTable(table) {
     const schema = await this._getSchema(table);
     const rows = (await this.engine.find(table, {}, { limit: 1e9, offset: 0 })).map(r => normalizeRow(r, schema));
@@ -2387,19 +2366,6 @@ class SQLExecutor {
     return out;
   }
 
-  /**
-   * 生成对端表的前缀 null 行：仅含 `prefix.col` 键（值为 null），
-   * 用于 JOIN 未匹配行补齐限定列，避免回退到未前缀副本拿错值。
-   */
-  _nullPrefixedRow(schema, prefix) {
-    const out = {};
-    for (const k of Object.keys(schema)) {
-      if (k === '_softDelete') continue;
-      out[prefix + '.' + k] = null;
-    }
-    return out;
-  }
-
   _aggValue(rows, fn, column) {
     if (fn === 'COUNT') return rows.length;
     const op = typeof column === 'string' ? { type: 'column', name: column } : column;
@@ -2479,7 +2445,6 @@ class SQLExecutor {
 
     let schema = null;
     let all;
-    let rowsAll;
     if (!statement.from) {
       // 无 FROM：虚拟行（SELECT 1, 'a'）
       all = [{ _virtual: true }];
@@ -2504,6 +2469,7 @@ class SQLExecutor {
         const rows = filtered.map(r => outCols.map(c => (c in r ? r[c] : null)));
         return { ok: true, type: 'select', table: firstItem.table, columns: outCols, rows, raw: filtered };
       }
+      let rowsAll;
       if (firstItem.subquery) {
         const res = await this.executeSelect(firstItem.subquery);
         rowsAll = { rows: this._subQueryRows(res), schema: null, columns: res.columns };
@@ -2529,10 +2495,6 @@ class SQLExecutor {
         }
         const matched = [];
         const unmatchedRight = new Set(rightRows.map((r, i) => i));
-        // 未匹配行补对端表的前缀 null 列：限定列名（如 a.id / b.id）按前缀解析，
-        // 避免回退到未前缀副本拿到错误值。
-        const rightNulls = (rightRes.schema) ? this._nullPrefixedRow(rightRes.schema, rightPrefix) : null;
-        const leftNulls = (rowsAll && rowsAll.schema) ? this._nullPrefixedRow(rowsAll.schema, firstPrefix) : null;
         rows.forEach(l => {
           let m = null;
           for (let ri = 0; ri < rightRows.length; ri++) {
@@ -2545,11 +2507,11 @@ class SQLExecutor {
             matched.push({ ...l, ...rightRows[m] });
             unmatchedRight.delete(m);
           } else if (j.type === 'left') {
-            matched.push(rightNulls ? { ...rightNulls, ...l } : { ...l });
+            matched.push({ ...l });
           }
         });
         if (j.type === 'right') {
-          for (const ri of unmatchedRight) matched.push(leftNulls ? { ...leftNulls, ...rightRows[ri] } : { ...rightRows[ri] });
+          for (const ri of unmatchedRight) matched.push({ ...rightRows[ri] });
         }
         rows = matched;
       }

package/lib/table.js

@@ -242,23 +242,6 @@ class Table {
         const schema = this._schema;
         const checkConstraints = this._checkConstraints;
         const foreignKeys = this._foreignKeys;
-        // 批量预分配自增 ID 范围：先扫描显式提供的最大值，一次性推进计数器，
-        // 再在循环内用本地序号递增，避免批量内重复读取/写入同一计数器字段。
-        const baseAutoInc = this._autoIncrement;
-        if (autoIncField) {
-            let maxExplicit = 0;
-            for (const it of items) {
-                const v = it[autoIncField];
-                if (v !== undefined && v !== null) {
-                    const n = Number(v);
-                    if (!isNaN(n) && n > maxExplicit) maxExplicit = n;
-                }
-            }
-            if (maxExplicit > baseAutoInc) {
-                this._autoIncrement = maxExplicit;
-            }
-        }
-        let autoIncSeq = 0;
         for (let i = 0; i < N; i++) {
             let data = items[i];
             for (const [f, dv] of Object.entries(defaults)) {
@@ -296,9 +279,8 @@ class Table {
                 }
             }
             if (autoIncField && data[autoIncField] === undefined) {
-                autoIncSeq++;
-                data[autoIncField] = baseAutoInc + autoIncSeq;
-                this._autoIncrement = data[autoIncField];
+                this._autoIncrement++;
+                data[autoIncField] = this._autoIncrement;
             } else if (autoIncField && data[autoIncField] > this._autoIncrement) {
                 this._autoIncrement = data[autoIncField];
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsql-neo",
-  "version": "5.1.3",
+  "version": "5.2.0",
   "description": "JSQL-NEO — Rust-powered embedded database with WASM, REST API, B-Tree indexes, WAL, crash recovery",
   "main": "index.js",
   "types": "index.d.ts",
@@ -49,8 +49,7 @@
     "test": "node test/smoke.js",
     "test:btree": "node test/btree.test.js",
     "test:regress": "node test/regress-5.1.0.js",
-    "test:all": "node test/smoke.js && node test/coverage.js && node test/regress-5.1.0.js && node test/btree.test.js && node test/join.test.js",
-    "test:join": "node test/join.test.js",
+    "test:all": "node test/smoke.js && node test/coverage.js && node test/regress-5.1.0.js && node test/btree.test.js",
     "test:coverage": "c8 --all --include='lib/**' --exclude='lib/mysql_server.js' --exclude='lib/native_client.js' --exclude='lib/wasm_client.js' --exclude='lib/mysql_compat.js' --exclude='lib/nedb_compat.js' --exclude='lib/plugin.js' --reporter=text --reporter=lcov node test/coverage.js",
     "test:orms": "node examples/orms/run-all.js"
   },

package/test/join.test.js

@@ -1,110 +0,0 @@
-/*
- * Regression tests for SQL JOIN null-fill correctness.
- * Zero runtime dependencies (uses Node builtins + in-repo libs only).
- *
- *   node test/join.test.js
- *
- * Covers:
- *   J1 LEFT JOIN unmatched rows null-fill right-table qualified columns
- *   J2 RIGHT JOIN unmatched rows null-fill left-table qualified columns
- *   J3 INNER JOIN unaffected
- *   J4 unqualified column reference in JOIN
- *   J5 WHERE filtering on the null-filled side
- *   J6 self-join with table alias
- *   J7 chained joins
- */
-const path = require('path');
-
-const ROOT = path.join(__dirname, '..');
-const Database = require(path.join(ROOT, 'lib/database'));
-const { executeSQL } = require(path.join(ROOT, 'lib/sql'));
-
-let passed = 0, failed = 0;
-function ok(name, cond, extra) {
-  if (cond) { passed++; console.log('[OK]', name); }
-  else { failed++; console.log('[FAIL]', name, extra !== undefined ? '-> ' + JSON.stringify(extra) : ''); }
-}
-
-async function setup(db) {
-  await executeSQL(db, 'CREATE TABLE a (id INT PRIMARY KEY, a_name STRING)');
-  await executeSQL(db, 'CREATE TABLE b (id INT PRIMARY KEY, a_id INT, b_name STRING)');
-  await executeSQL(db, "INSERT INTO a VALUES (1,'A1'),(2,'A2'),(3,'A3')");
-  await executeSQL(db, "INSERT INTO b VALUES (10,2,'B2'),(20,99,'B99')");
-}
-
-(async () => {
-  /* ============ J1 LEFT JOIN null-fill ============ */
-  {
-    const db = new Database(':memory:', { autoSave: false });
-    await setup(db);
-    const r = await executeSQL(db, 'SELECT a.id AS aid, a.a_name, b.id AS bid, b.b_name FROM a LEFT JOIN b ON a.id = b.a_id');
-    const row1 = r.rows[0]; // a=1 unmatched
-    ok('J1 left unmatched row', row1 && row1[0] === 1 && row1[1] === 'A1' && row1[2] === null && row1[3] === null, row1);
-    const row3 = r.rows[2]; // a=3 unmatched
-    ok('J1 second unmatched row', row3 && row3[0] === 3 && row3[2] === null, row3);
-    const row2 = r.rows[1]; // matched
-    ok('J1 matched row intact', row2 && row2[0] === 2 && row2[1] === 'A2' && row2[2] === 10 && row2[3] === 'B2', row2);
-  }
-
-  /* ============ J2 RIGHT JOIN null-fill ============ */
-  {
-    const db = new Database(':memory:', { autoSave: false });
-    await setup(db);
-    const r = await executeSQL(db, 'SELECT a.id AS aid, a.a_name, b.id AS bid, b.b_name FROM a RIGHT JOIN b ON a.id = b.a_id');
-    const b99 = r.rows[1]; // b=20 unmatched (a_id=99)
-    ok('J2 right unmatched row', b99 && b99[0] === null && b99[1] === null && b99[2] === 20 && b99[3] === 'B99', b99);
-    const b2 = r.rows[0]; // matched
-    ok('J2 matched row intact', b2 && b2[0] === 2 && b2[1] === 'A2' && b2[2] === 10 && b2[3] === 'B2', b2);
-  }
-
-  /* ============ J3 INNER JOIN ============ */
-  {
-    const db = new Database(':memory:', { autoSave: false });
-    await setup(db);
-    const r = await executeSQL(db, 'SELECT a.id AS aid, b.id AS bid FROM a INNER JOIN b ON a.id = b.a_id');
-    ok('J3 inner join', r.rows.length === 1 && r.rows[0][0] === 2 && r.rows[0][1] === 10, r.rows);
-  }
-
-  /* ============ J4 unqualified reference ============ */
-  {
-    const db = new Database(':memory:', { autoSave: false });
-    await setup(db);
-    const r = await executeSQL(db, 'SELECT a.id AS aid, b.b_name FROM a LEFT JOIN b ON a.id = b.a_id');
-    ok('J4 unprefixed id resolves to left table', r.rows[0][0] === 1 && r.rows[0][1] === null, r.rows[0]);
-  }
-
-  /* ============ J5 WHERE on null-filled side ============ */
-  {
-    const db = new Database(':memory:', { autoSave: false });
-    await setup(db);
-    const r = await executeSQL(db, "SELECT a.id AS aid, b.b_name FROM a LEFT JOIN b ON a.id = b.a_id WHERE b.id IS NULL");
-    ok('J5 left where b.id IS NULL', r.rows.length === 2 && r.rows.every(x => x[1] === null), r.rows);
-    const r2 = await executeSQL(db, "SELECT a.a_name, b.id AS bid FROM a RIGHT JOIN b ON a.id = b.a_id WHERE a.id IS NULL");
-    ok('J5 right where a.id IS NULL', r2.rows.length === 1 && r2.rows[0][0] === null && r2.rows[0][1] === 20, r2.rows);
-  }
-
-  /* ============ J6 self-join with alias ============ */
-  {
-    const db = new Database(':memory:', { autoSave: false });
-    await executeSQL(db, 'CREATE TABLE emp (id INT PRIMARY KEY, mgr_id INT, name STRING)');
-    await executeSQL(db, "INSERT INTO emp VALUES (1,NULL,'boss'),(2,1,'alice'),(3,999,'orphan')");
-    const r = await executeSQL(db, 'SELECT e.name AS ename, m.name AS mname FROM emp e LEFT JOIN emp m ON e.mgr_id = m.id');
-    ok('J6 self left join', r.rows.length === 3 && r.rows[0][0] === 'boss' && r.rows[0][1] === null && r.rows[1][1] === 'boss' && r.rows[2][1] === null, r.rows);
-  }
-
-  /* ============ J7 chained joins ============ */
-  {
-    const db = new Database(':memory:', { autoSave: false });
-    await executeSQL(db, 'CREATE TABLE a (id INT PRIMARY KEY, a_name STRING)');
-    await executeSQL(db, 'CREATE TABLE b (id INT PRIMARY KEY, a_id INT, b_name STRING)');
-    await executeSQL(db, 'CREATE TABLE c (id INT PRIMARY KEY, b_id INT, c_name STRING)');
-    await executeSQL(db, "INSERT INTO a VALUES (1,'A1'),(2,'A2'),(3,'A3')");
-    await executeSQL(db, "INSERT INTO b VALUES (10,2,'B2'),(20,99,'B99')");
-    await executeSQL(db, "INSERT INTO c VALUES (100,10,'C10'),(200,77,'C77')");
-    const r = await executeSQL(db, 'SELECT a.id AS aid, b.id AS bid, c.id AS cid, c.c_name FROM a LEFT JOIN b ON a.id = b.a_id LEFT JOIN c ON b.id = c.b_id');
-    ok('J7 chained left joins', r.rows.length === 3 && r.rows[1][1] === 10 && r.rows[1][2] === 100 && r.rows[1][3] === 'C10' && r.rows[0][1] === null && r.rows[0][2] === null, r.rows);
-  }
-
-  console.log(failed === 0 ? `\nALL ${passed} JOIN TESTS PASSED` : `\n${failed} FAILURES (${passed} passed)`);
-  process.exit(failed === 0 ? 0 : 1);
-})().catch((e) => { console.error('FATAL', e); process.exit(1); });