jsql-neo 6.3.1 → 6.3.2

package/lib/database.js

@@ -1428,6 +1428,8 @@ class Database {
     async stop() {
         this._runHooks('onStop', []);
         this._emit('stop', {});
+        // 内存监控定时器：stop() 此前从不清理，重复创建/销毁实例会堆积定时器
+        if (this._monitorTimer) { clearInterval(this._monitorTimer); this._monitorTimer = null; }
         if (this._dirMode) {
             if (this._flushTimer) { clearTimeout(this._flushTimer); this._flushTimer = null; }
             try {
@@ -1635,6 +1637,8 @@ class Database {
             clearTimeout(this._autoSaveTimer);
             this._autoSaveTimer = null;
         }
+        // 同样清理内存监控定时器，否则 close() 后仍在后台触发 _checkMemory
+        if (this._monitorTimer) { clearInterval(this._monitorTimer); this._monitorTimer = null; }
         if (this._dirMode) {
             try {
                 this._flushDirty();

package/lib/date-types.js

@@ -175,10 +175,13 @@ function validateTime(value, fieldName) {
 function now(type = 'datetime') {
     const d = new Date();
     switch (type) {
-        case 'date': return d.toISOString().slice(0, 10);
+        // 必须与 validateDate/validateDateTime 一致使用本地时区：
+        // toISOString() 是 UTC，东八区 00:00 本地会被算成前一天 16:00Z，
+        // 导致 now() 写入的日期比实际早一天。
+        case 'date': return toLocalDateString(d);
         case 'timestamp': return Math.floor(d.getTime() / 1000);
-        case 'time': return d.toISOString().slice(11, 19);
-        default: return d.toISOString().replace('T', ' ').slice(0, 19);
+        case 'time': return pad2(d.getHours()) + ':' + pad2(d.getMinutes()) + ':' + pad2(d.getSeconds());
+        default: return toLocalDateTimeString(d);
     }
 }
 

package/lib/mysql_compat.js

@@ -212,7 +212,6 @@ class Connection extends EventEmitter {
       this.state = 'closed';
       this.stream.destroy();
       this.emit('close');
-      return undefined;
     })();
     if (cb) p.then(() => cb(null), err => cb(err));
     return p;
@@ -373,7 +372,6 @@ class Pool {
       const engines = Array.from(this._sharedEngines.values());
       this._sharedEngines.clear();
       await Promise.allSettled(engines.map(e => (typeof e.stop === 'function' ? e.stop() : null)));
-      return undefined;
     })();
     if (cb) p.then(() => cb(null), err => cb(err));
     return p;

package/lib/sql.js

@@ -3239,7 +3239,9 @@ function evaluateExpr(expr, row, ctx) {
       const v = resolveOperand(expr.operand, row, ctx);
       const lo = resolveOperand(expr.low, row, ctx);
       const hi = resolveOperand(expr.high, row, ctx);
-      if (v === null || lo === null || hi === null) return false;
+      // 三值逻辑：任一操作数为 NULL 时结果是 UNKNOWN（用 null 表示），
+      // 与普通比较运算符一致；不能返回 false，否则 NOT BETWEEN 会被误判为真。
+      if (v === null || v === undefined || lo === null || lo === undefined || hi === null || hi === undefined) return null;
       const inRange = typeof v === 'number' && typeof lo === 'number' && typeof hi === 'number'
         ? v >= lo && v <= hi
         : String(v) >= String(lo) && String(v) <= String(hi);
@@ -5010,7 +5012,7 @@ class SQLExecutor {
       if (firstItem && firstItem.table && String(firstItem.table).toLowerCase().startsWith('information_schema.')) {
         const view = String(firstItem.table).toLowerCase().split('.')[1];
         const all = await this._infoSchemaRows(view);
-        const filtered = statement.where ? all.filter(r => evaluateExpr(statement.where, r)) : all;
+        const filtered = statement.where ? all.filter(r => evaluateExpr(statement.where, r, this.ctx)) : all;
         const cols = statement.columns.map(c => scalarColumnName(c));
         const isStar = cols.length === 1 && cols[0] === '*';
         let outCols;
@@ -5055,7 +5057,7 @@ class SQLExecutor {
           // 一对多：一个左行可能匹配多个右行，必须全部收进来（此前只取第一个）
           const hits = [];
           for (let ri = 0; ri < rightRows.length; ri++) {
-            if (evaluateExpr(j.on, { ...l, ...rightRows[ri] })) hits.push(ri);
+            if (evaluateExpr(j.on, { ...l, ...rightRows[ri] }, this.ctx)) hits.push(ri);
           }
           if (hits.length > 0) {
             for (const ri of hits) {

package/lib/table.js

@@ -234,8 +234,6 @@ class Table {
                 if (row[field] !== undefined && row[field] !== null) uniqueTracker[field].add(row[field]);
             }
         }
-        const dateFields = this._cachedDateFields;
-        const hasDateFields = dateFields.length > 0;
         const autoIncField = this._autoIncrementField;
         const defaults = this._defaults;
         const computedFields = this._computedFields;
@@ -259,17 +257,16 @@ class Table {
             }
         }
         let autoIncSeq = 0;
+        const result = new Array(N);
         for (let i = 0; i < N; i++) {
-            let data = items[i];
+            // 在副本上做默认值/计算列/类型归一，避免污染调用方传入的原始对象
+            let data = { ...items[i] };
             for (const [f, dv] of Object.entries(defaults)) {
                 if (data[f] === undefined) data[f] = typeof dv === 'function' ? dv() : dv === 'CURRENT_TIMESTAMP' ? now() : dv;
             }
             for (const f of Object.keys(computedFields)) data[f] = computedFields[f](data);
-            if (hasDateFields) {
-                for (const f of dateFields) {
-                    if (data[f] !== undefined && data[f] !== null) data[f] = validateDateType(data[f], this._dateFields[f], f);
-                }
-            }
+            // 与单条 insert 保持一致：归一时间/数值/布尔/字符串类型（此前 insertMany 跳过了这一步）
+            data = this._validateDataTypes(data);
             for (const field of this._cachedSchemaFields) {
                 const def = schema[field];
                 if (def.required && (data[field] === undefined || data[field] === null)
@@ -312,15 +309,16 @@ class Table {
                 const val = data[field];
                 if (val !== undefined && val !== null) tree.insert(val, rowIdx);
             }
-            items[i] = data;
+            // 不写回调用方传入的 items，改为返回归一后的新数组
+            result[i] = data;
         }
         this._dirty = true;
         this._db._markDirty(this._name);
         for (const hook of this._hooks.afterInsert) {
-            for (let i = 0; i < N; i++) hook(items[i]);
+            for (let i = 0; i < N; i++) hook(result[i]);
         }
         this._db._emitChange('insertMany', this._name, { count: N });
-        return items;
+        return result;
     }
 
     upsert(data) {

package/package.json

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

@@ -105,6 +105,16 @@ async function setup(db) {
     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);
   }
 
+  /* ============ J8 JOIN ON 透传 ctx ============ */
+  {
+    const db = new Database(':memory:', { autoSave: false });
+    await setup(db);
+    // ON 条件引用 @@会话变量：此前 evaluateExpr(j.on, row) 漏传 ctx，
+    // @@jv 解析为 null 导致匹配全丢，这里锁定必须透传 this.ctx。
+    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 AND b.id = @@jv', { session: { sysvars: { jv: 10 } } });
+    ok('J8 JOIN ON 透传 ctx（@@会话变量可解析）', r.rows.length === 1 && r.rows[0][0] === 2 && r.rows[0][1] === 10, 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); });

package/test/query-opt.test.js

@@ -4,6 +4,8 @@
  */
 const Database = require('../lib/database');
 const BTree = require('../lib/btree');
+const { executeSQL } = require('../lib/sql');
+const { now } = require('../lib/date-types');
 
 let passed = 0, failed = 0;
 function ok(name, cond, extra) {
@@ -104,6 +106,59 @@ function ok(name, cond, extra) {
     ok('batch afterInsert', afterInsertHits === 2, afterInsertHits);
   }
 
+  /* ============ BUG 修复: now() 时区 / 监控定时器 / insertMany 归一 & 不污染 ============ */
+  {
+    // BUG-1: now() 必须与 validateDate/DateTime 一致使用本地时区（此前用 toISOString=UTC）
+    const savedTZ = process.env.TZ;
+    process.env.TZ = 'Asia/Shanghai';
+    try {
+      const d = new Date();
+      const p2 = n => String(n).padStart(2, '0');
+      const localDate = `${d.getFullYear()}-${p2(d.getMonth() + 1)}-${p2(d.getDate())}`;
+      const localTime = `${p2(d.getHours())}:${p2(d.getMinutes())}:${p2(d.getSeconds())}`;
+      ok('BUG-1 now("date") 本地时区', now('date') === localDate, { got: now('date'), want: localDate });
+      ok('BUG-1 now("time") 本地时区', now('time') === localTime, { got: now('time'), want: localTime });
+      ok('BUG-1 now() 本地时区', now() === `${localDate} ${localTime}`, { got: now(), want: `${localDate} ${localTime}` });
+    } finally {
+      if (savedTZ === undefined) delete process.env.TZ; else process.env.TZ = savedTZ;
+    }
+
+    // BUG-5: 内存监控定时器必须被 stop()/close() 清理
+    const mdb = new Database(':memory:', { autoSave: false });
+    await mdb.createTable('m', { id: 'integer' });
+    mdb._startMonitor();
+    ok('BUG-5 monitor 已启动', !!mdb._monitorTimer);
+    await mdb.stop();
+    ok('BUG-5 stop() 清理 monitorTimer', mdb._monitorTimer === null);
+    mdb._startMonitor();
+    mdb.close();
+    ok('BUG-5 close() 清理 monitorTimer', mdb._monitorTimer === null);
+
+    // BUG-6 / BUG-8: insertMany 在副本上归一，且不污染调用方对象
+    const tdb = new Database(':memory:', { autoSave: false });
+    await tdb.createTable('t', {
+      id: { type: 'integer', primaryKey: true, autoIncrement: true },
+      d: 'date', st: { type: 'string', default: 'x' }, age: 'integer'
+    });
+    const srcDate = new Date('2024-01-15T00:00:00Z');
+    const caller = [{ d: srcDate, age: '25' }];
+    const before = JSON.stringify(caller[0]);
+    const ret = tdb.t.insertMany(caller);
+    ok('BUG-6 insertMany 不污染调用方对象', JSON.stringify(caller[0]) === before, caller[0]);
+    ok('BUG-6 insertMany 返回归一后的新数组', Array.isArray(ret) && ret !== caller && ret[0].st === 'x' && ret[0].id === 1, ret);
+    const stored = tdb.t.find({})[0];
+    ok('BUG-8 insertMany 归一年龄为 number', typeof stored.age === 'number' && stored.age === 25, stored.age);
+    const p2 = n => String(n).padStart(2, '0');
+    const wantDate = `${srcDate.getFullYear()}-${p2(srcDate.getMonth() + 1)}-${p2(srcDate.getDate())}`;
+    ok('BUG-8 insertMany 归一日期为本地字符串', stored.d === wantDate, { got: stored.d, want: wantDate });
+
+    // BUG-4: information_schema 过滤条件必须透传 ctx（@@会话变量）
+    const idb = new Database(':memory:', { autoSave: false });
+    await idb.createTable('ifx', { id: 'integer' });
+    const ir = await executeSQL(idb, 'SELECT TABLE_NAME FROM information_schema.tables WHERE TABLE_NAME = @@tn', { session: { sysvars: { tn: 'ifx' } } });
+    ok('BUG-4 information_schema WHERE 透传 ctx', ir.rows.length === 1 && ir.rows[0][0] === 'ifx', ir.rows);
+  }
+
   console.log(failed === 0 ? `\nALL ${passed} QUERY-OPT TESTS PASSED` : `\n${failed} FAILURES (${passed} passed)`);
   process.exit(failed === 0 ? 0 : 1);
 })().catch(e => { console.error('FATAL', e); process.exit(1); });

package/test/sql-parser.test.js

@@ -282,6 +282,17 @@ const rowsOf = (r) => (Array.isArray(r) ? r[0] : r).rows;
     ok('ROUND(1.5, 101) 不再抛 RangeError', await roundOf('ROUND(1.5, 101)') === 1.5);
   }
 
+  /* ================= BUG 修复: BETWEEN 含 NULL 的三值逻辑 ================= */
+  console.log('\n--- BUG 修复: BETWEEN NULL 三值逻辑 ---');
+  {
+    const nrows = async (sql) => rowsOf(await executeSQL(engine, sql, OPTS)).length;
+    // engine 行：sal 100/200/300/300
+    ok('sal BETWEEN NULL AND 400 不选行', await nrows('SELECT id FROM emp WHERE sal BETWEEN NULL AND 400') === 0);
+    ok('NOT sal BETWEEN NULL AND 400 不误选行', await nrows('SELECT id FROM emp WHERE NOT sal BETWEEN NULL AND 400') === 0);
+    ok('对照 NOT sal = NULL 也不选行', await nrows('SELECT id FROM emp WHERE NOT sal = NULL') === 0);
+    ok('正常 BETWEEN 区间仍工作', await nrows('SELECT id FROM emp WHERE sal BETWEEN 100 AND 200') === 2);
+  }
+
   /* ================= 5.6.0: 相关子查询（曾静默返回 null） ================= */
   console.log('\n--- 5.6.0: 相关子查询 ---');
   {