jsql-neo 6.5.16 → 6.5.17

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

package/lib/sql.js

@@ -2885,8 +2885,21 @@ function applyCast(value, dataType) {
   if (value === null || value === undefined) return null;
   // SIGNED / UNSIGNED 是 MySQL 的整型别名（CAST(x AS SIGNED)），
   // 此前没列入整型分支，导致 CAST('12abc' AS SIGNED) 原样返回字符串。
+  // CAST(x AS UNSIGNED)：MySQL 先取整，再按 64 位无符号回绕（负数变成补码），
+  // CAST(-5 AS UNSIGNED) = 18446744073709551611。用 BigInt 保精度，
+  // 序列化层会把 BigInt 转成字符串（见 6.5.11 的超大整数处理）。
+  if (t === 'UNSIGNED') {
+    let n;
+    if (typeof value === 'boolean') n = value ? 1n : 0n;
+    else if (typeof value === 'number') n = Number.isFinite(value) ? BigInt(Math.trunc(value)) : 0n;
+    else {
+      const m = String(value).trim().match(/^[+-]?\d+(\.\d+)?/);
+      n = m ? BigInt(Math.trunc(Number(m[0]))) : 0n;
+    }
+    return BigInt.asUintN(64, n);
+  }
   if (t === 'INTEGER' || t === 'INT' || t === 'BIGINT' || t === 'SMALLINT' ||
-      t === 'TINYINT' || t === 'SIGNED' || t === 'UNSIGNED' || t === 'MEDIUMINT') {
+      t === 'TINYINT' || t === 'SIGNED' || t === 'MEDIUMINT') {
     // MySQL CAST(... AS SIGNED/INT)：取数字前缀（'12abc'→12），无法解析时返回 0（而非 null）。
     if (typeof value === 'boolean') return value ? 1 : 0;
     if (typeof value === 'number') return Number.isFinite(value) ? Math.trunc(value) : 0;
@@ -3498,7 +3511,13 @@ function applyScalarFunction(fnNode, row, ctx) {
     }
     case 'UPPER': case 'UCASE': return args[0] == null ? null : String(args[0]).toUpperCase();
     case 'LOWER': case 'LCASE': return args[0] == null ? null : String(args[0]).toLowerCase();
-    case 'LENGTH': case 'CHAR_LENGTH': case 'CHARACTER_LENGTH': return args[0] == null ? null : String(args[0]).length;
+    // MySQL：LENGTH 是「字节数」（utf8mb4 下 'héllo' = 6），
+    // CHAR_LENGTH / CHARACTER_LENGTH 才是「字符数」。此前三个全按字符数，
+    // 非 ASCII 文本的字节长度全部偏小。
+    case 'LENGTH': case 'OCTET_LENGTH':
+      return args[0] == null ? null : Buffer.byteLength(String(args[0]), 'utf8');
+    case 'CHAR_LENGTH': case 'CHARACTER_LENGTH':
+      return args[0] == null ? null : String(args[0]).length;
     // TRIM(s) / TRIM([LEADING|TRAILING|BOTH] chars FROM s) / TRIM(s, chars)
     case 'TRIM': {
       if (args[0] == null) return null;
@@ -3785,7 +3804,10 @@ function applyScalarFunction(fnNode, row, ctx) {
     case 'FLOOR': return args[0] == null ? null : Math.floor(args[0]);
     case 'CEIL': case 'CEILING': return args[0] == null ? null : Math.ceil(args[0]);
     case 'MOD': return (args[0] == null || args[1] === 0) ? null : args[0] % args[1];
-    case 'POWER': case 'POW': return args[0] == null ? null : Math.pow(args[0], args[1]);
+    case 'POWER': case 'POW':
+      // MySQL：任一参数为 NULL 就返回 NULL。Math.pow(2, null) 会按 0 算出 1。
+      if (args[0] == null || args[1] == null) return null;
+      return Math.pow(args[0], args[1]);
     case 'SQRT': return args[0] == null ? null : Math.sqrt(args[0]);
     case 'IFNULL': case 'NVL': return args[0] != null ? args[0] : args[1];
     case 'COALESCE': {
@@ -3820,8 +3842,20 @@ function applyScalarFunction(fnNode, row, ctx) {
       }
       return s.substr(start - 1);
     }
-    case 'LEFT': return args[0] == null ? null : String(args[0]).slice(0, Number(args[1]));
-    case 'RIGHT': return args[0] == null ? null : String(args[0]).slice(-Number(args[1]));
+    // MySQL：负长度返回空串（不是「从末尾切」或丢参数后的怪异子串）。
+    case 'LEFT': {
+      if (args[0] == null) return null;
+      const n = Number(args[1]);
+      if (!Number.isFinite(n) || n < 0) return '';
+      return String(args[0]).slice(0, n);
+    }
+    case 'RIGHT': {
+      if (args[0] == null) return null;
+      const n = Number(args[1]);
+      if (!Number.isFinite(n) || n < 0) return '';
+      if (n === 0) return '';
+      return String(args[0]).slice(-n);
+    }
     case 'LOCATE': {
       if (args[0] == null || args[1] == null) return null;
       const idx = String(args[1]).indexOf(String(args[0]));
@@ -3884,23 +3918,31 @@ function applyScalarFunction(fnNode, row, ctx) {
       }
       return Array.isArray(v) ? v.length : null;
     }
+    // MySQL：填充串按「需要多少补多少」截断，不能整段循环拼接——
+    // LPAD('hi',5,'xy') = 'xyxhi'（此前每轮都加完整的 'xy'，得到 'xyxyhi'）。
     case 'LPAD': {
-      if (args[0] == null) return null;
-      let s = String(args[0]);
-      const n = Number(args[1]);
-      const pad = args[2] == null ? ' ' : String(args[2]);
+      if (args[0] == null || args[1] == null) return null;
+      if (args.length >= 3 && args[2] == null) return null;
+      const s = String(args[0]);
+      const n = Math.trunc(Number(args[1]));
+      if (!Number.isFinite(n)) return null;
       if (n <= s.length) return s.slice(0, n);
-      while (s.length < n) s = pad + s;
-      return s;
+      const pad = args[2] === undefined ? ' ' : String(args[2]);
+      if (pad === '') return s;
+      const need = n - s.length;
+      return pad.repeat(Math.ceil(need / pad.length)).slice(0, need) + s;
     }
     case 'RPAD': {
-      if (args[0] == null) return null;
-      let s = String(args[0]);
-      const n = Number(args[1]);
-      const pad = args[2] == null ? ' ' : String(args[2]);
+      if (args[0] == null || args[1] == null) return null;
+      if (args.length >= 3 && args[2] == null) return null;
+      const s = String(args[0]);
+      const n = Math.trunc(Number(args[1]));
+      if (!Number.isFinite(n)) return null;
       if (n <= s.length) return s.slice(0, n);
-      while (s.length < n) s = s + pad;
-      return s;
+      const pad = args[2] === undefined ? ' ' : String(args[2]);
+      if (pad === '') return s;
+      const need = n - s.length;
+      return s + pad.repeat(Math.ceil(need / pad.length)).slice(0, need);
     }
     case 'RAND': return args.length > 0 && args[0] != null ? seedRand(Number(args[0]))() : Math.random();
     case 'UNIX_TIMESTAMP': {

package/package.json

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

package/test/extra-coverage.test.js

@@ -159,15 +159,16 @@ test('超长字符串 100000 字符正常处理', async () => {
   assert.strictEqual(await one(q, `SELECT LENGTH('${long}')`), 100000);
 });
 
-test('Unicode é 正确处理（LENGTH=5, UPPER 含重音）', async () => {
+test('Unicode é 正确处理（LENGTH=6 字节 / CHAR_LENGTH=5, UPPER 含重音）', async () => {
   const { q } = makeDb();
-  assert.strictEqual(await one(q, "SELECT LENGTH('héllo')"), 5);
+  assert.strictEqual(await one(q, "SELECT LENGTH('héllo')"), 6);
+  assert.strictEqual(await one(q, "SELECT CHAR_LENGTH('héllo')"), 5);
   assert.strictEqual(await one(q, "SELECT UPPER('café')"), 'CAFÉ');
 });
 
-test('Emoji 按 UTF-16 单元计数（LENGTH=4）', async () => {
+test('Emoji 按 UTF-8 字节计数（LENGTH=8）', async () => {
   const { q } = makeDb();
-  assert.strictEqual(await one(q, "SELECT LENGTH('🚀🌟')"), 4);
+  assert.strictEqual(await one(q, "SELECT LENGTH('🚀🌟')"), 8);
 });
 
 test('Emoji UPPER 无变化', async () => {

package/test/v6.5.14-regression.test.js

@@ -272,6 +272,32 @@ function makeDb() { return new Database(':memory:'); }
   ok('RLIKE BINARY 同样生效', eq((await q("SELECT id FROM r6 WHERE s RLIKE BINARY 'abc'")).rows, [[1]]));
   ok('非法正则安全返回不匹配', eq((await q("SELECT id FROM r6 WHERE s REGEXP BINARY '('")).rows, []));
 
+  // ── B1–B6. 标量函数语义（v6.5.17） ─────────────────────────
+  console.log('\n--- B1–B6. 标量函数 ---');
+  ok('B1 LENGTH 按字节（héllo=6）', (await one("SELECT LENGTH('héllo')")) === 6, await one("SELECT LENGTH('héllo')"));
+  ok('B1 CHAR_LENGTH 按字符（héllo=5）', (await one("SELECT CHAR_LENGTH('héllo')")) === 5);
+  ok('B1 emoji 字节数（🚀🌟=8）', (await one("SELECT LENGTH('🚀🌟')")) === 8);
+  ok('B2 OCTET_LENGTH 已实现（héllo=6）', (await one("SELECT OCTET_LENGTH('héllo')")) === 6);
+  ok('B2 OCTET_LENGTH NULL → NULL', (await one('SELECT OCTET_LENGTH(NULL)')) === null);
+  ok("B3 LEFT('hello',-3) → ''", (await one("SELECT LEFT('hello',-3)")) === '');
+  ok("B3 RIGHT('hello',-3) → ''", (await one("SELECT RIGHT('hello',-3)")) === '');
+  ok("B3 LEFT('hello',0) → ''", (await one("SELECT LEFT('hello',0)")) === '');
+  ok("B3 LEFT('hello',3) → 'hel'", (await one("SELECT LEFT('hello',3)")) === 'hel');
+  ok("B3 RIGHT('hello',3) → 'llo'", (await one("SELECT RIGHT('hello',3)")) === 'llo');
+  ok("B4 LPAD('hi',5,'xy') → 'xyxhi'", (await one("SELECT LPAD('hi',5,'xy')")) === 'xyxhi',
+    await one("SELECT LPAD('hi',5,'xy')"));
+  ok("B4 RPAD('hi',5,'xy') → 'hixyx'", (await one("SELECT RPAD('hi',5,'xy')")) === 'hixyx',
+    await one("SELECT RPAD('hi',5,'xy')"));
+  ok("B4 LPAD 目标更短时截断", (await one("SELECT LPAD('hello',3,'xy')")) === 'hel');
+  ok('B4 LPAD 填充串为 NULL → NULL', (await one("SELECT LPAD('hi',5,NULL)")) === null);
+  ok('B5 POWER(2,NULL) → NULL', (await one('SELECT POWER(2,NULL)')) === null);
+  ok('B5 POW(NULL,2) → NULL', (await one('SELECT POW(NULL,2)')) === null);
+  ok('B5 POWER 正常仍为 8', (await one('SELECT POWER(2,3)')) === 8);
+  ok('B6 CAST(-5 AS UNSIGNED) 64 位回绕', String(await one('SELECT CAST(-5 AS UNSIGNED)')) === '18446744073709551611',
+    String(await one('SELECT CAST(-5 AS UNSIGNED)')));
+  ok('B6 CAST(5 AS UNSIGNED) 保持原值', String(await one('SELECT CAST(5 AS UNSIGNED)')) === '5');
+  ok('B6 CAST(-5 AS SIGNED) 不回绕', (await one('SELECT CAST(-5 AS SIGNED)')) === -5);
+
   // ── M9. 插件钩子优先级 ─────────────────────────────────────
   console.log('\n--- M9. 钩子优先级 ---');
   {