jsql-neo 6.0.5 → 6.2.0

package/lib/sql.js

@@ -112,6 +112,8 @@ function tokenize(sql) {
           else str += esc;
           j += 2;
         } else if (sql[j] === quote) {
+          // SQL 标准转义：字符串内两个连续引号表示一个字面量引号（'O''Brien' → O'Brien）
+          if (sql[j + 1] === quote) { str += quote; j += 2; continue; }
           break;
         } else {
           str += sql[j];
@@ -1855,6 +1857,13 @@ class Parser {
         this.expect('op', ')');
         return { type: 'cast', expr, dataType };
       }
+      // 零参时间函数：CURRENT_DATE / CURRENT_TIME / CURRENT_TIMESTAMP（可省略括号）。
+      // 此前不在 KEYWORDS 里，被当成列名解析 → "no such column: CURRENT_DATE"
+      if (['CURRENT_DATE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP'].includes(String(t.value).toUpperCase())) {
+        const name = String(t.value).toUpperCase();
+        if (this.peek().type === 'op' && this.peek().value === '(') { this.next(); this.expect('op', ')'); }
+        return { type: 'func', name, args: [] };
+      }
       // EXTRACT(YEAR FROM expr) —— 标准 SQL 的 FROM 形式
       if (String(t.value).toUpperCase() === 'EXTRACT' && this.peek().type === 'op' && this.peek().value === '(') {
         this.next();
@@ -2491,6 +2500,12 @@ function parseSqlDate(v) {
 
 function pad2(n) { return String(n).padStart(2, '0'); }
 
+/** 本地时区的 'YYYY-MM-DD HH:mm:ss'（MySQL 的 NOW() 语义；区别于 UTC_TIMESTAMP） */
+function sqlLocalDateTime(d = new Date()) {
+  return d.getFullYear() + '-' + pad2(d.getMonth() + 1) + '-' + pad2(d.getDate()) + ' ' +
+    pad2(d.getHours()) + ':' + pad2(d.getMinutes()) + ':' + pad2(d.getSeconds());
+}
+
 /** 按输入形态回写日期：纯日期返回 YYYY-MM-DD，带时间返回 YYYY-MM-DD HH:MM:SS */
 function fmtSqlDate(dateOnly, d) {
   const ymd = d.getFullYear() + '-' + pad2(d.getMonth() + 1) + '-' + pad2(d.getDate());
@@ -2522,9 +2537,11 @@ function applyScalarFunction(fnNode, row, ctx) {
     case 'FOUND_ROWS': return session && session.foundRows !== undefined ? session.foundRows : 0;
     case 'CONNECTION_ID': return session && session.connectionId !== undefined ? session.connectionId : 0;
     case 'DATABASE': case 'SCHEMA': return session && session.currentDb ? session.currentDb : 'default';
-    case 'NOW': case 'CURRENT_TIMESTAMP': return new Date().toISOString().slice(0, 19).replace('T', ' ');
-    case 'CURDATE': case 'CURRENT_DATE': return new Date().toISOString().slice(0, 10);
-    case 'CURTIME': return new Date().toISOString().slice(11, 19);
+    // NOW() / CURDATE() / CURTIME() 返回会话时区（本地）时间，不能用 toISOString()（UTC）——
+    // 否则东八区凌晨会整整差一天（2024-02-29 被存成 2024-02-28）。
+    case 'NOW': case 'CURRENT_TIMESTAMP': return sqlLocalDateTime();
+    case 'CURDATE': case 'CURRENT_DATE': return sqlLocalDateTime().slice(0, 10);
+    case 'CURTIME': return sqlLocalDateTime().slice(11, 19);
     case 'UTC_TIMESTAMP': return new Date().toISOString().slice(0, 19).replace('T', ' ') + ' UTC';
     case 'CONCAT': return args.map(a => a === null || a === undefined ? '' : String(a)).join('');
     case 'CONCAT_WS': {
@@ -2829,7 +2846,8 @@ function evaluateExpr(expr, row, ctx) {
       const v = resolveOperand(expr.operand, row, ctx);
       if (expr.subquery && expr.subquery._values !== undefined) expr.list = expr.subquery._values;
       if (!expr.list) return false;
-      return expr.list.some(x => x === v || String(x) === String(v));
+      const r = expr.list.some(x => x === v || String(x) === String(v));
+      return expr.not ? !r : r;   // NOT IN：此前漏了取反，导致 NOT IN 与 IN 结果相同
     }
     case 'like': {
       const v = resolveOperand(expr.operand, row, ctx);
@@ -4644,16 +4662,16 @@ class SQLExecutor {
         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;
+          // 一对多：一个左行可能匹配多个右行，必须全部收进来（此前只取第一个）
+          const hits = [];
           for (let ri = 0; ri < rightRows.length; ri++) {
-            if (evaluateExpr(j.on, { ...l, ...rightRows[ri] })) {
-              m = ri;
-              break;
-            }
+            if (evaluateExpr(j.on, { ...l, ...rightRows[ri] })) hits.push(ri);
           }
-          if (m !== null) {
-            matched.push({ ...l, ...rightRows[m] });
-            unmatchedRight.delete(m);
+          if (hits.length > 0) {
+            for (const ri of hits) {
+              matched.push({ ...l, ...rightRows[ri] });
+              unmatchedRight.delete(ri);
+            }
           } else if (j.type === 'left' || j.type === 'full') {
             matched.push(rightNulls ? { ...rightNulls, ...l } : { ...l });
           }
@@ -4729,6 +4747,10 @@ class SQLExecutor {
       const seen = new Set();
       rows = rows.filter(r => {
         const key = JSON.stringify(statement.columns.map(c => {
+          // SELECT DISTINCT *：按整行去重（此前把 '*' 当列名解析成 null，导致所有行同 key 只剩 1 行）
+          if (c.expr === '*') {
+            return Object.keys(r).filter(k => !String(k).startsWith('_')).sort().map(k => r[k]);
+          }
           if (c.scalar) return resolveOperand(c.scalar, r, this.ctx);
           if (c.caseExpr) return evaluateCaseVal(c.caseExpr, r);
           if (c.aggregate) return this._aggValue(r._group || [r], c.aggregate || 'COUNT', c.column, c.distinct, c.separator, c.orderBy);
@@ -4776,10 +4798,20 @@ class SQLExecutor {
     }
 
     if (statement.orderBy) {
-      // ORDER BY 项可能是列名字符串，也可能是表达式节点
-      const ordVal = (row, o) => (typeof o.column === 'string'
-        ? resolveOperand({ type: 'column', name: o.column }, row, this.ctx)
-        : resolveOperand(o.column, row, this.ctx));
+      // ORDER BY 项可能是列名字符串、表达式节点，或列的位置序号（ORDER BY 1，1-based）
+      const ordNames = statement.columns.map(c => scalarColumnName(c));
+      const ordVal = (row, o) => {
+        const pos = (o.column && typeof o.column === 'object' && o.column.type === 'value' && typeof o.column.value === 'number')
+          ? o.column.value
+          : (typeof o.column === 'number' ? o.column : null);
+        if (pos !== null && pos !== undefined) {
+          const name = ordNames[pos - 1];
+          if (name !== undefined && name !== null) return resolveOperand({ type: 'column', name }, row, this.ctx);
+        }
+        return typeof o.column === 'string'
+          ? resolveOperand({ type: 'column', name: o.column }, row, this.ctx)
+          : resolveOperand(o.column, row, this.ctx);
+      };
       const cmp = (a, b) => {
         for (const o of statement.orderBy) {
           const av = ordVal(a, o);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsql-neo",
-  "version": "6.0.5",
+  "version": "6.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",

package/postinstall.js

@@ -14,10 +14,43 @@ const BP = path.join(ROOT, 'bin', BIN_NAME);
 // Native N-API module (native/jsql-neo-native.node)
 const NATIVE_PATH = path.join(ROOT, 'native', 'jsql-neo-native.node');
 
-// GitHub 加速代理前缀；把原始 github 链接直接拼在后面即可
-const GHPROXY = 'https://gh-proxy.com/';
+// GitHub 加速代理前缀；加速站的用法是把原始 URL 直接拼在后面：
+//   https://<host>/https://github.com/owner/repo/releases/download/vX.Y.Z/asset?token=<TOKEN>
+// 可用环境变量覆盖 / 叠加（逗号分隔多个，按序尝试）；空字符串 '' 表示直连兜底。
+// 加速站候选（按优先级）：自建站优先，公共站回退，最后直连兜底。
+const DEFAULT_PROXIES = [
+  'https://gh-proxyjsql-neoworkerapi.vexify.de5.net/',
+  'https://gh-proxy.com/',
+];
+const GHPROXY = process.env.JSQL_GHPROXY !== undefined
+  ? process.env.JSQL_GHPROXY
+  : DEFAULT_PROXIES[0];
+const GHPROXY_TOKEN = process.env.JSQL_GHPROXY_TOKEN || '';
 const TAG = `v${pkg.version}`;
 
+/**
+ * 生成候选下载地址列表（按优先级）：
+ *   环境变量 JSQL_GHPROXY 指定的代理 → 内置加速站 → 直连
+ */
+function proxyCandidates(raw) {
+  const bases = String(process.env.JSQL_GHPROXY || '')
+    .split(',')
+    .map((s) => s.trim())
+    .filter(Boolean)
+    .concat(DEFAULT_PROXIES)
+    .concat('');
+  const list = [];
+  for (const base of bases) {
+    let url = raw;
+    if (base) url = (base.endsWith('/') ? base : base + '/') + raw;
+    if (base && GHPROXY_TOKEN) {
+      url += (url.indexOf('?') === -1 ? '?' : '&') + 'token=' + encodeURIComponent(GHPROXY_TOKEN);
+    }
+    if (list.indexOf(url) === -1) list.push(url);
+  }
+  return list;
+}
+
 // 从 repository 字段提取 owner/repo，例如 vexify-org/JSQL-neo
 const REPO = (pkg.repository && pkg.repository.url)
   ? pkg.repository.url.replace(/\.git$/, '').replace(/^.*github\.com\//i, '')
@@ -95,20 +128,22 @@ function tryLoadNative() {
 
 async function downloadAndVerify() {
   const asset = `jsql-neo-native.${nativeTargetSuffix()}.node`;
-  const url = `${GHPROXY}https://github.com/${REPO}/releases/download/${TAG}/${asset}`;
-  console.log(`[jsql-neo] downloading native module: ${url}`);
-  try {
-    await download(url, NATIVE_PATH);
-    if (!tryLoadNative()) {
-      console.warn('[jsql-neo] downloaded module also invalid, removed.');
-      return false;
+  const raw = `https://github.com/${REPO}/releases/download/${TAG}/${asset}`;
+  // 依次尝试：环境变量指定的代理 → 内置加速站 → 直连
+  for (const url of proxyCandidates(raw)) {
+    console.log(`[jsql-neo] downloading native module: ${url}`);
+    try {
+      await download(url, NATIVE_PATH);
+      if (tryLoadNative()) {
+        console.log('[jsql-neo] native module downloaded: native/jsql-neo-native.node');
+        return true;
+      }
+      console.warn('[jsql-neo] downloaded module cannot be loaded; trying next source.');
+    } catch (e) {
+      console.warn('[jsql-neo] download failed:', e.message);
     }
-    console.log('[jsql-neo] native module downloaded: native/jsql-neo-native.node');
-    return true;
-  } catch (e) {
-    console.warn('[jsql-neo] download failed, falling back to source build:', e.message);
-    return false;
   }
+  return false;
 }
 
 async function ensureNativeNode() {

package/test/readme-audit.test.js

@@ -202,6 +202,13 @@ async function main() {
     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]]');
+    // —— 6.2.0 回归项（这些曾不报错但结果错）——
+    ok('NOT IN 取反', JSON.stringify(await rowsOf('SELECT id FROM tbl WHERE id NOT IN (1,2)')) === '[[3]]');
+    const dStar = await rowsOf('SELECT DISTINCT * FROM tbl');
+    ok('DISTINCT * 按整行去重（此前只剩 1 行）', dStar.length === 3, dStar);
+    ok('ORDER BY 1 按第 1 列排序', JSON.stringify(await rowsOf('SELECT n FROM tbl ORDER BY 1')) === '[[10],[20],[30]]');
+    ok("'' 内双写引号转义",
+      JSON.stringify(await rowsOf("SELECT 'O''Brien' AS x FROM tbl WHERE id = 1")) === '[["O\'Brien"]]');
     ok("LIKE ... ESCAPE '!' 匹配字面量 %",
       JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE s LIKE '100!%' ESCAPE '!'")) === '[[1]]');
     ok('LIKE 反斜杠转义匹配字面量 %',
@@ -392,6 +399,34 @@ async function main() {
     }
   }
 
+  console.log('\n--- 6.2.0 回归：JOIN 一对多 / NOW() 用本地时区 ---');
+  {
+    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);
+      await run('CREATE TABLE ru (id INT PRIMARY KEY, name TEXT)');
+      await run('CREATE TABLE ro (id INT PRIMARY KEY, uid INT, amt INT)');
+      await run("INSERT INTO ru (id,name) VALUES (1,'x')");
+      await run('INSERT INTO ro (id,uid,amt) VALUES (1,1,10),(2,1,20),(3,1,30)');
+      const j = await run('SELECT ru.name, ro.amt FROM ru JOIN ro ON ru.id = ro.uid');
+      ok('JOIN 一对多返回 3 行', j.rows.length === 3, j.rows);
+
+      const n = await run('SELECT NOW() AS d');
+      const nowLocal = new Date();
+      const p = (x) => String(x).padStart(2, '0');
+      const expectYmd = nowLocal.getFullYear() + '-' + p(nowLocal.getMonth() + 1) + '-' + p(nowLocal.getDate());
+      ok('NOW() 返回本地时区日期', String(n.rows[0][0]).slice(0, 10) === expectYmd, n.rows);
+      await db.stop();
+    }
+  }
+
   console.log('\n--- Redis：RESP2 帧解析（曾 inline 命令恒为 unknown command）---');
   {
     const { RedisServer } = require('../lib/redis_server.js');