jsql-neo 5.3.0 → 5.3.1

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.**
 
-> **v5.3.0** — official release build · [github.com/vexify-org/JSQL-neo](https://github.com/vexify-org/JSQL-neo)
+> **v5.3.1** — 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)
@@ -232,7 +232,7 @@ npm install && npm run build                 # option 3: from source
 Verify:
 
 ```bash
-node -e "console.log(require('jsql-neo/package.json').version)"   # 5.3.0
+node -e "console.log(require('jsql-neo/package.json').version)"   # 5.3.1
 ```
 
 ### 30-second demo
@@ -1273,7 +1273,7 @@ jsql mod --engine wasm        # switch engine (restart required)
 
 ```bash
 $ jsql version
-jsql-neo v5.3.0
+jsql-neo v5.3.1
 engine: native (napi) | wasm | js
 node: v22.0.0  platform: linux x64
 ```
@@ -1294,7 +1294,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=5.3.0`.
+The status bar shows: `db=<name> dialect=<d> mode=<tui|batch> ver=5.3.1`.
 
 ### Keyboard shortcuts
 
@@ -3858,7 +3858,7 @@ Data dir: /root/.jsql-neo/data
 
 ```bash
 $ jsql version
-jsql-neo v5.3.0
+jsql-neo v5.3.1
 engine: native (napi) | wasm | js
 node: v22.0.0
 platform: linux x64
@@ -4754,7 +4754,7 @@ SOFTWARE.
 
 *JSQL-NEO — One engine to rule them all. MySQL. PostgreSQL. MongoDB. Redis. SQL. TypeScript. The browser.*
 
-*文档版本：v5.3.0 · 最后更新：2026-08-12*
+*文档版本：v5.3.1 · 最后更新：2026-08-12*
 
 ---
 
@@ -6524,7 +6524,7 @@ Usage: jsql version
 
 输出版本与环境信息：
 
-  jsql-neo v5.3.0
+  jsql-neo v5.3.1
   engine: native (napi) | wasm | js
   node: v22.0.0
   platform: linux x64
@@ -6788,6 +6788,14 @@ new TUIShell({
 
 ## 附录 N：版本历史 CHANGELOG
 
+### v5.3.1 (2026-08-12)
+
+**修复**
+- `MysqlConnection` 未导出导致多协议服务器 MySQL 路由崩溃（`lib/mysql_server.js` 补导出）
+
+**变更**
+- 版本号升至 5.3.1（package.json / Mongo `buildInfo` 同步）
+
 ### v5.3.0 (2026-08-12)
 
 **新增**
@@ -7146,7 +7154,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.*
 
-*文档版本：v5.3.0 · 共 19 个附录 · 最后更新：2026-08-12*
+*文档版本：v5.3.1 · 共 19 个附录 · 最后更新：2026-08-12*
 
 ---
 
@@ -7753,4 +7761,4 @@ npm test
 
 *JSQL-NEO — One engine to rule them all. MySQL. PostgreSQL. MongoDB. Redis. SQL. TypeScript. The browser.*
 
-*文档版本：v5.3.0 · 附录 A–Z · 全文 6000+ 行 · 最后更新：2026-08-12*
+*文档版本：v5.3.1 · 附录 A–Z · 全文 6000+ 行 · 最后更新：2026-08-12*

package/lib/mongo_server.js

@@ -322,7 +322,7 @@ class MongoServer {
           localTime: new Date(), logicalSessionTimeoutMinutes: 30, connectionId: 1,
         };
       case 'ping': return { ok: 1 };
-      case 'buildInfo': return { ok: 1, version: '5.3.0-jsql-neo', gitVersion: 'jsql-neo', versionArray: [5, 3, 0, 0] };
+      case 'buildInfo': return { ok: 1, version: '5.3.1-jsql-neo', gitVersion: 'jsql-neo', versionArray: [5, 3, 1, 0] };
       case 'getParameter': return { ok: 1 };
       case 'endSessions': return { ok: 1 };
       case 'listDatabases':

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({ ...fr, ...this._nullRow(join, true) });
+                    result.push(this._rightNullRow(localRows, fr, join));
                 } 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({ ...fr, ...this._nullRow(join, true) });
+                    result.push(this._rightNullRow(localRows, fr, join));
                 } else {
                     for (const lr of matches) {
                         result.push(this._mergeJoinRow(lr, fr, join));
@@ -621,6 +621,24 @@ 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,12 +261,18 @@ class Parser {
     if (this.peek().type === 'op' && this.peek().value === '.') {
       this.next();
       const t2 = this.next();
-      if (t2.type !== 'ident') throw new Error(`Expected table name after '.', got '${t2.value}'`);
+      if (t2.type !== 'ident' && !(t2.type === 'keyword' && this._isSchemaView(t2.value))) {
+        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');
@@ -1870,11 +1876,12 @@ 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 = row._rid !== undefined ? row._rid : row.id;
+            const id = this._rowPkId(row, pkCols);
             if (id !== undefined) {
               const data = {};
               for (const [col, val] of statement.assignments) {
@@ -1892,11 +1899,12 @@ 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 = row._rid !== undefined ? row._rid : row.id;
+            const id = this._rowPkId(row, pkCols);
             if (id !== undefined) ids.push(id);
           }
         }
@@ -2166,6 +2174,19 @@ 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));
@@ -2366,6 +2387,19 @@ 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;
@@ -2445,6 +2479,7 @@ class SQLExecutor {
 
     let schema = null;
     let all;
+    let rowsAll;
     if (!statement.from) {
       // 无 FROM：虚拟行（SELECT 1, 'a'）
       all = [{ _virtual: true }];
@@ -2469,7 +2504,6 @@ 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 };
@@ -2495,6 +2529,10 @@ 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++) {
@@ -2507,11 +2545,11 @@ class SQLExecutor {
             matched.push({ ...l, ...rightRows[m] });
             unmatchedRight.delete(m);
           } else if (j.type === 'left') {
-            matched.push({ ...l });
+            matched.push(rightNulls ? { ...rightNulls, ...l } : { ...l });
           }
         });
         if (j.type === 'right') {
-          for (const ri of unmatchedRight) matched.push({ ...rightRows[ri] });
+          for (const ri of unmatchedRight) matched.push(leftNulls ? { ...leftNulls, ...rightRows[ri] } : { ...rightRows[ri] });
         }
         rows = matched;
       }

package/lib/table.js

@@ -242,6 +242,23 @@ 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)) {
@@ -279,8 +296,9 @@ class Table {
                 }
             }
             if (autoIncField && data[autoIncField] === undefined) {
-                this._autoIncrement++;
-                data[autoIncField] = this._autoIncrement;
+                autoIncSeq++;
+                data[autoIncField] = baseAutoInc + autoIncSeq;
+                this._autoIncrement = data[autoIncField];
             } else if (autoIncField && data[autoIncField] > this._autoIncrement) {
                 this._autoIncrement = data[autoIncField];
             }

package/package.json

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