@maiyunnet/kebab 9.6.0 → 9.7.0

package/doc/kebab-rag.md

@@ -1360,7 +1360,7 @@ index/variables/VER.md
 
 # Variable: VER
 
-> `const` **VER**: `"9.6.0"` = `'9.6.0'`
+> `const` **VER**: `"9.7.0"` = `'9.7.0'`
 
 Defined in: [index.ts:10](https://github.com/maiyunnet/kebab/blob/master/index.ts#L10)
 
@@ -13675,7 +13675,7 @@ Defined in: [lib/sql.ts:69](https://github.com/maiyunnet/kebab/blob/master/lib/s
 
 > **append**(`sql`): `this`
 
-Defined in: [lib/sql.ts:980](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L980)
+Defined in: [lib/sql.ts:1003](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L1003)
 
 在 sql 最后追加字符串
 
@@ -13695,7 +13695,7 @@ Defined in: [lib/sql.ts:980](https://github.com/maiyunnet/kebab/blob/master/lib/
 
 > **by**(`c`, `d?`): `this`
 
-Defined in: [lib/sql.ts:736](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L736)
+Defined in: [lib/sql.ts:759](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L759)
 
 ORDER BY
 
@@ -13723,7 +13723,7 @@ ORDER BY
 
 > **copy**(`f?`, `opt?`): `Sql`
 
-Defined in: [lib/sql.ts:804](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L804)
+Defined in: [lib/sql.ts:827](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L827)
 
 创建一个本对象的一个新的 sql 对象拷贝
 
@@ -13751,7 +13751,7 @@ Defined in: [lib/sql.ts:804](https://github.com/maiyunnet/kebab/blob/master/lib/
 
 > **crossJoin**(`f`, `s?`, `suf?`, `pre?`): `this`
 
-Defined in: [lib/sql.ts:485](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L485)
+Defined in: [lib/sql.ts:488](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L488)
 
 cross join 方法
 
@@ -13791,7 +13791,7 @@ MySQL 时为表前缀，PostgreSQL 时为 Schema 名，仅在 join 非默认前
 
 > **delete**(`f`): `this`
 
-Defined in: [lib/sql.ts:373](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L373)
+Defined in: [lib/sql.ts:376](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L376)
 
 'xx'
 
@@ -13813,7 +13813,7 @@ Defined in: [lib/sql.ts:373](https://github.com/maiyunnet/kebab/blob/master/lib/
 
 > **field**(`str`, `pre?`, `suf?`): `string`
 
-Defined in: [lib/sql.ts:991](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L991)
+Defined in: [lib/sql.ts:1014](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L1014)
 
 对字段进行包裹
 
@@ -13845,7 +13845,7 @@ MySQL 时为表前缀，PostgreSQL 时为 Schema 名，仅请在 field 表名时
 
 > **format**(`sql?`, `data?`): `string`
 
-Defined in: [lib/sql.ts:970](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L970)
+Defined in: [lib/sql.ts:993](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L993)
 
 获取带 data 的 sql 语句
 
@@ -13869,7 +13869,7 @@ Defined in: [lib/sql.ts:970](https://github.com/maiyunnet/kebab/blob/master/lib/
 
 > **fullJoin**(`f`, `s?`, `suf?`, `pre?`): `this`
 
-Defined in: [lib/sql.ts:474](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L474)
+Defined in: [lib/sql.ts:477](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L477)
 
 full join 方法
 
@@ -13909,7 +13909,7 @@ MySQL 时为表前缀，PostgreSQL 时为 Schema 名，仅在 join 非默认前
 
 > **getData**(): [`DbValue`](../../../index/type-aliases/DbValue.md)[]
 
-Defined in: [lib/sql.ts:954](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L954)
+Defined in: [lib/sql.ts:977](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L977)
 
 获取全部 data
 
@@ -13923,7 +13923,7 @@ Defined in: [lib/sql.ts:954](https://github.com/maiyunnet/kebab/blob/master/lib/
 
 > **getPre**(): `string`
 
-Defined in: [lib/sql.ts:961](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L961)
+Defined in: [lib/sql.ts:984](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L984)
 
 获取定义的 pre
 
@@ -13937,7 +13937,7 @@ Defined in: [lib/sql.ts:961](https://github.com/maiyunnet/kebab/blob/master/lib/
 
 > **getSql**(): `string`
 
-Defined in: [lib/sql.ts:938](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L938)
+Defined in: [lib/sql.ts:961](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L961)
 
 获取 sql 语句
 
@@ -13951,7 +13951,7 @@ Defined in: [lib/sql.ts:938](https://github.com/maiyunnet/kebab/blob/master/lib/
 
 > **group**(`c`): `this`
 
-Defined in: [lib/sql.ts:760](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L760)
+Defined in: [lib/sql.ts:783](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L783)
 
 GROUP BY
 
@@ -13973,7 +13973,7 @@ GROUP BY
 
 > **having**(`s?`): `this`
 
-Defined in: [lib/sql.ts:492](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L492)
+Defined in: [lib/sql.ts:495](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L495)
 
 having 后置筛选器，用法类似 where
 
@@ -13993,7 +13993,7 @@ having 后置筛选器，用法类似 where
 
 > **innerJoin**(`f`, `s?`, `suf?`, `pre?`): `this`
 
-Defined in: [lib/sql.ts:463](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L463)
+Defined in: [lib/sql.ts:466](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L466)
 
 inner join 方法
 
@@ -14061,7 +14061,7 @@ Defined in: [lib/sql.ts:99](https://github.com/maiyunnet/kebab/blob/master/lib/s
 
 > **join**(`f`, `s?`, `type?`, `suf?`, `pre?`): `this`
 
-Defined in: [lib/sql.ts:415](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L415)
+Defined in: [lib/sql.ts:418](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L418)
 
 join 方法
 
@@ -14107,7 +14107,7 @@ MySQL 时为表前缀，PostgreSQL 时为 Schema 名，仅在 join 非默认前
 
 > **leftJoin**(`f`, `s?`, `suf?`, `pre?`): `this`
 
-Defined in: [lib/sql.ts:441](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L441)
+Defined in: [lib/sql.ts:444](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L444)
 
 left join 方法
 
@@ -14147,7 +14147,7 @@ MySQL 时为表前缀，PostgreSQL 时为 Schema 名，仅在 join 非默认前
 
 > **limit**(`a`, `b?`): `this`
 
-Defined in: [lib/sql.ts:780](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L780)
+Defined in: [lib/sql.ts:803](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L803)
 
 LIMIT（limit、offset, limit）
 
@@ -14175,7 +14175,7 @@ LIMIT（limit、offset, limit）
 
 > **lock**(): `this`
 
-Defined in: [lib/sql.ts:795](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L795)
+Defined in: [lib/sql.ts:818](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L818)
 
 追加消极锁，通常不建议使用
 
@@ -14189,7 +14189,7 @@ Defined in: [lib/sql.ts:795](https://github.com/maiyunnet/kebab/blob/master/lib/
 
 > **rightJoin**(`f`, `s?`, `suf?`, `pre?`): `this`
 
-Defined in: [lib/sql.ts:452](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L452)
+Defined in: [lib/sql.ts:455](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L455)
 
 right join 方法
 
@@ -14229,7 +14229,7 @@ MySQL 时为表前缀，PostgreSQL 时为 Schema 名，仅在 join 非默认前
 
 > **select**(`c`, `f`): `this`
 
-Defined in: [lib/sql.ts:264](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L264)
+Defined in: [lib/sql.ts:267](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L267)
 
 '*', 'xx'
 
@@ -14257,7 +14257,7 @@ Defined in: [lib/sql.ts:264](https://github.com/maiyunnet/kebab/blob/master/lib/
 
 > **union**(`lsql`, `type?`): `this`
 
-Defined in: [lib/sql.ts:385](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L385)
+Defined in: [lib/sql.ts:388](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L388)
 
 联查另一个 sql 对象
 
@@ -14285,7 +14285,7 @@ sql 对象
 
 > **unionAll**(`lsql`): `this`
 
-Defined in: [lib/sql.ts:403](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L403)
+Defined in: [lib/sql.ts:406](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L406)
 
 所有联查另一个 sql 对象
 
@@ -14307,7 +14307,7 @@ sql 对象
 
 > **update**(`f`, `s`): `this`
 
-Defined in: [lib/sql.ts:305](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L305)
+Defined in: [lib/sql.ts:308](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L308)
 
 UPDATE SQL 方法
 
@@ -14433,7 +14433,7 @@ Defined in: [lib/sql.ts:118](https://github.com/maiyunnet/kebab/blob/master/lib/
 
 > **where**(`s`): `this`
 
-Defined in: [lib/sql.ts:526](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L526)
+Defined in: [lib/sql.ts:529](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L529)
 
 筛选器
 1. 'city': 'bj', 'type': '2'
@@ -14576,7 +14576,7 @@ lib/sql/functions/aoMix.md
 
 > **aoMix**(`arr`): `Record`\<`string`, `string` \| `number` \| [`Json`](../../../index/type-aliases/Json.md)\>
 
-Defined in: [lib/sql.ts:1376](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L1376)
+Defined in: [lib/sql.ts:1399](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L1399)
 
 将数组兑换为组合的对象（Array/Object mix）
 
@@ -14605,7 +14605,7 @@ lib/sql/functions/column.md
 
 > **column**(`field`): `object`
 
-Defined in: [lib/sql.ts:1397](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L1397)
+Defined in: [lib/sql.ts:1420](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L1420)
 
 创建字段对象
 
@@ -14644,7 +14644,7 @@ lib/sql/functions/format.md
 
 > **format**(`sql`, `data`, `service?`): `string`
 
-Defined in: [lib/sql.ts:1338](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L1338)
+Defined in: [lib/sql.ts:1361](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L1361)
 
 返回代入后的完整 SQL 字符串，这并不安全不能直接执行，只是用来调试打印 sql 语句
 
@@ -14685,7 +14685,7 @@ lib/sql/functions/get.md
 
 > **get**(`opt`): [`Sql`](../classes/Sql.md)
 
-Defined in: [lib/sql.ts:1310](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L1310)
+Defined in: [lib/sql.ts:1333](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L1333)
 
 创建 sql 对象
 
@@ -14738,7 +14738,7 @@ lib/sql/functions/json.md
 
 > **json**(`obj`): `any`
 
-Defined in: [lib/sql.ts:1435](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L1435)
+Defined in: [lib/sql.ts:1458](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L1458)
 
 将对象转换为 JSON 字符串并避开类型检查，用于适配 PostgreSQL 的 jsonb 字段
 
@@ -14767,7 +14767,7 @@ lib/sql/functions/value.md
 
 > **value**(`val`): `object`
 
-Defined in: [lib/sql.ts:1416](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L1416)
+Defined in: [lib/sql.ts:1439](https://github.com/maiyunnet/kebab/blob/master/lib/sql.ts#L1439)
 
 创建字面量值对象，用于 where 条件中 v[0] 需要是值而非字段名的场景
 例：[value('hello'), 'IN', column('tags')]

package/index.d.ts

@@ -5,7 +5,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export declare const VER = "9.6.0";
+export declare const VER = "9.7.0";
 /** --- 框架根目录，以 / 结尾  --- */
 export declare const ROOT_PATH: string;
 /** --- 框架的 LIB，以 / 结尾 --- */

package/index.js

@@ -6,7 +6,7 @@
  * --- 本文件用来定义每个目录实体地址的常量 ---
  */
 /** --- 当前系统版本号 --- */
-export const VER = '9.6.0';
+export const VER = '9.7.0';
 // --- 服务端用的路径 ---
 const imu = decodeURIComponent(import.meta.url).replace('file://', '').replace(/^\/(\w:)/, '$1');
 /** --- /xxx/xxx --- */

package/lib/sql.js

@@ -182,21 +182,24 @@ export class Sql {
         const quotedTable = this.field(table, this._pre);
         const quotedKey = this.field(key);
         if (this._service === ESERVICE.MYSQL) {
-            // --- MySQL 8.0.19+ VALUES ROW() 派生表语法 ---
-            const valueParts = [];
-            for (const row of rows) {
-                const parts = row.map(v => {
+            // --- MySQL 使用 UNION ALL SELECT 子查询，比 VALUES ROW() 更稳定 ---
+            // --- MySQL 8.0 优化器在行数较多时对 VALUES ROW() 派生表会走不同执行路径，
+            //     导致列名别名解析失败，JOIN 静默匹配 0 行；UNION ALL 无此问题 ---
+            const selectParts = [];
+            for (let ri = 0; ri < rows.length; ri++) {
+                const row = rows[ri];
+                const parts = row.map((v, ci) => {
                     const result = this._processValue(v);
                     if (result.data.length > 0) {
                         this._data.push(...result.data);
                     }
-                    return result.sql;
+                    // --- 第一行加列名别名，后续行省略 ---
+                    return ri === 0 ? `${result.sql} AS ${this.field(allCols[ci])}` : result.sql;
                 });
-                valueParts.push(`ROW(${parts.join(', ')})`);
+                selectParts.push(`SELECT ${parts.join(', ')}`);
             }
-            const tmpCols = allCols.map(c => this.field(c)).join(', ');
             const setClauses = cols.map(c => `t.${this.field(c)} = tmp.${this.field(c)}`).join(', ');
-            this._sql = [`UPDATE ${quotedTable} t INNER JOIN (VALUES ${valueParts.join(', ')}) AS tmp(${tmpCols}) ON t.${quotedKey} = tmp.${quotedKey} SET ${setClauses}`];
+            this._sql = [`UPDATE ${quotedTable} t INNER JOIN (${selectParts.join(' UNION ALL ')}) AS tmp ON t.${quotedKey} = tmp.${quotedKey} SET ${setClauses}`];
         }
         else {
             // --- PostgreSQL 使用 UPDATE FROM (VALUES ...) ---
@@ -596,8 +599,18 @@ export class Sql {
                     // --- 3 ---
                     sql += this.field(v[0]) + ' ' + v[1].toUpperCase() + ' (';
                     for (const v1 of v[2]) {
-                        sql += this._placeholder() + ', ';
-                        data.push(v1);
+                        if (Array.isArray(v1)) {
+                            sql += '(';
+                            for (const v2 of v1) {
+                                sql += this._placeholder() + ', ';
+                                data.push(v2);
+                            }
+                            sql = sql.slice(0, -2) + '), ';
+                        }
+                        else {
+                            sql += this._placeholder() + ', ';
+                            data.push(v1);
+                        }
                     }
                     sql = sql.slice(0, -2) + ') AND ';
                 }
@@ -658,8 +671,18 @@ export class Sql {
                         if (v.length > 0) {
                             sql += this.field(k) + ' IN (';
                             for (const v1 of v) {
-                                sql += this._placeholder() + ', ';
-                                data.push(v1);
+                                if (Array.isArray(v1)) {
+                                    sql += '(';
+                                    for (const v2 of v1) {
+                                        sql += this._placeholder() + ', ';
+                                        data.push(v2);
+                                    }
+                                    sql = sql.slice(0, -2) + '), ';
+                                }
+                                else {
+                                    sql += this._placeholder() + ', ';
+                                    data.push(v1);
+                                }
                             }
                             sql = sql.slice(0, -2) + ') AND ';
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maiyunnet/kebab",
-  "version": "9.6.0",
+  "version": "9.7.0",
   "description": "Simple, easy-to-use, and fully-featured Node.js framework that is ready-to-use out of the box.",
   "type": "module",
   "keywords": [

package/www/example/ctr/test.js

@@ -3405,12 +3405,14 @@ Result:<pre id="result">Nothing.</pre>`);
                 s = sql.update('order', { 'state': '1' }).where({
                     'user_id': '2',
                     'state': ['1', '2', '3'],
+                    '(a, b, c)': [['1', '2', '3'], ['4', '5', '6']],
                     '$or': [{ 'type': '1', 'find': '0' }, { 'type': '2', 'find': '1' }, [['type', '<', '-1']]]
                 }).getSql();
                 sd = sql.getData();
                 echo.push(`<pre>sql.update('order', { 'state': '1' }).where({
     'user_id': '2',
     'state': ['1', '2', '3'],
+    '(a, b, c)': [['1', '2', '3'], ['4', '5', '6']],
     '$or': [{ 'type': '1', 'find': '0' }, { 'type': '2', 'find': '1' }, [['type', '<', '-1']]]
 });</pre>
 <b>getSql() :</b> ${s}<br>