baja-lite 1.5.18 → 1.5.20

package/sql.js

@@ -21,7 +21,6 @@ import tslib from 'tslib';
 import { convert } from './convert-xml.js';
 import { Throw } from './error.js';
 import { excuteSplit, ExcuteSplitMode, sleep } from './fn.js';
-import { ArrayList } from './list.js';
 import { add, calc, ten2Any } from './math.js';
 import { C2P, C2P2, P2C } from './object.js';
 import { emptyString } from './string.js';
@@ -179,10 +178,8 @@ export var TemplateResult;
     TemplateResult[TemplateResult["NotSureOne"] = 1] = "NotSureOne";
     /** 返回多条记录 */
     TemplateResult[TemplateResult["Many"] = 2] = "Many";
-    /** 返回多条记录并封装ArrayList */
-    TemplateResult[TemplateResult["ManyList"] = 3] = "ManyList";
     /** 仅查询记录数量 */
-    TemplateResult[TemplateResult["Count"] = 4] = "Count";
+    TemplateResult[TemplateResult["Count"] = 3] = "Count";
 })(TemplateResult || (TemplateResult = {}));
 export var SelectResult;
 (function (SelectResult) {
@@ -196,12 +193,8 @@ export var SelectResult;
     SelectResult[SelectResult["R_CS_NotSure"] = 3] = "R_CS_NotSure";
     /** 多行一列 */
     SelectResult[SelectResult["RS_C"] = 4] = "RS_C";
-    /** 多行一列并封装ArrayList */
-    SelectResult[SelectResult["RS_C_List"] = 5] = "RS_C_List";
     /** 多行多列 */
-    SelectResult[SelectResult["RS_CS"] = 6] = "RS_CS";
-    /** 多行多列并封装ArrayList */
-    SelectResult[SelectResult["RS_CS_List"] = 7] = "RS_CS_List";
+    SelectResult[SelectResult["RS_CS"] = 5] = "RS_CS";
 })(SelectResult || (SelectResult = {}));
 export var ColumnMode;
 (function (ColumnMode) {
@@ -2649,9 +2642,6 @@ export class SqlService {
             case TemplateResult.Count: {
                 return result[0].ct;
             }
-            case TemplateResult.ManyList: {
-                return new ArrayList(result[0]);
-            }
         }
     }
     template(option) {
@@ -2823,39 +2813,6 @@ export class SqlService {
                     }
                 }
             }
-            case SelectResult.RS_C_List: {
-                try {
-                    if (dataConvert) {
-                        const key = Object.keys(result[0])[0];
-                        if (key && dataConvert[key] && globalThis[_DataConvert][dataConvert[key]]) {
-                            return new ArrayList(result.map((r) => globalThis[_DataConvert][dataConvert[key]](Object.values(r)[0])));
-                        }
-                    }
-                    return new ArrayList(result.map((r) => Object.values(r)[0]));
-                }
-                catch (error) {
-                    return new ArrayList();
-                }
-            }
-            case SelectResult.RS_CS_List: {
-                if (mapper) {
-                    return new ArrayList(iterate(result).map((data) => flatData({
-                        data,
-                        mapper,
-                        mapperIfUndefined
-                    })).toArray());
-                }
-                else {
-                    hump = hump === true || (hump === undefined && globalThis[_Hump] === true);
-                    const __dataConvert = dataConvert ? Object.fromEntries(Object.entries(dataConvert).map(([k, v]) => [k, globalThis[_DataConvert][v]])) : undefined;
-                    if (hump || __dataConvert) {
-                        return new ArrayList(iterate(result).map((r) => C2P2(r, hump, __dataConvert)).toArray());
-                    }
-                    else {
-                        return new ArrayList();
-                    }
-                }
-            }
         }
     }
     select(option) {
@@ -2884,8 +2841,9 @@ export class SqlService {
             });
         }
     }
-    selectMuit(option) {
+    selectBatch(option) {
         Throw.if(!option.sqlId && !option.sql, 'not found sql!');
+        option.selectResult ?? (option.selectResult = SelectResult.RS_CS);
         if (option.sqlId && globalThis[_resultMap_SQLID][option.sqlId] && !option.mapper) {
             option.mapper = globalThis[_resultMap_SQLID][option.sqlId];
         }
@@ -2894,13 +2852,13 @@ export class SqlService {
         const { sql, params } = this._generSql(option.dbType, option.sql, _params);
         if (option.sync === SyncMode.Sync) {
             const result = option.conn.query(SyncMode.Sync, sql, params);
-            return result.map(item => this._select(SelectResult.RS_CS, result, null, undefined, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert));
+            return result.map(item => this._select(option.selectResult, result, null, undefined, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert));
         }
         else {
             return new Promise(async (resolve, reject) => {
                 try {
                     const result = await option.conn.query(SyncMode.Async, sql, params);
-                    resolve(result.map(item => this._select(SelectResult.RS_CS, result, null, undefined, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert)));
+                    resolve(result.map(item => this._select(option.selectResult, result, null, undefined, option.hump, option.mapper, option.mapperIfUndefined, option.dataConvert)));
                 }
                 catch (error) {
                     reject(error);
@@ -3405,7 +3363,7 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Object)
-], SqlService.prototype, "selectMuit", null);
+], SqlService.prototype, "selectBatch", null);
 __decorate([
     P(),
     __metadata("design:type", Function),
@@ -3539,7 +3497,7 @@ class StreamQuery {
                     const paramKeys = {};
                     for (const [key, value] of Object.entries(t)) {
                         const pkey = `p${this._prefix}${this._index++}`;
-                        this._wheres.push(`AND ${this[_fields][String(key)]?.C2()} = :${pkey} `);
+                        this._wheres.push(`AND t.${this[_fields][String(key)]?.C2()} = :${pkey} `);
                         this._param[pkey] = value;
                         if (paramName) {
                             paramKeys[key] = pkey;
@@ -3563,14 +3521,6 @@ class StreamQuery {
     eqWith(key1, key2) { return this._key(key1, key2, '='); }
     /** AND key1 <> key2 */
     notEqWith(key1, key2) { return this._key(key1, key2, '<>'); }
-    /** AND key REGEXP :regexp */
-    regexp(key, regexp, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._(key, regexp, 'REGEXP', { paramName, skipEmptyString: true, breakExcuteIfEmpty }); }
-    /** AND key NOT REGEXP :regexp */
-    notRegexp(key, regexp, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._(key, regexp, 'REGEXP', { paramName, skipEmptyString: true, not: 'NOT', breakExcuteIfEmpty }); }
-    /** AND (key1 << 8) + key2 = value */
-    shiftEq(key1, key2, value, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._shift(key1, key2, value, '=', { paramName, breakExcuteIfEmpty }); }
-    /** AND (key1 << 8) + key2 <> value */
-    shiftNotEq(key1, key2, value, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._shift(key1, key2, value, '<>', { paramName, breakExcuteIfEmpty }); }
     /** AND key > :value */
     grate(key, value, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._(key, value, '>', { paramName, skipEmptyString: true, breakExcuteIfEmpty }); }
     /** AND key >= :value */
@@ -3587,6 +3537,18 @@ class StreamQuery {
     lessWith(key1, key2) { return this._key(key1, key2, '<'); }
     /** AND key1 <= key2 */
     lessEqWith(key1, key2) { return this._key(key1, key2, '<='); }
+    /** AND key REGEXP :regexp */
+    regexp(key, regexp, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._(key, regexp, 'REGEXP', { paramName, skipEmptyString: true, breakExcuteIfEmpty }); }
+    /** AND key NOT REGEXP :regexp */
+    notRegexp(key, regexp, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._(key, regexp, 'REGEXP', { paramName, skipEmptyString: true, not: 'NOT', breakExcuteIfEmpty }); }
+    /** AND :regexp REGEXP key */
+    regexp2(key, regexp, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._2(key, regexp, 'REGEXP', { paramName, skipEmptyString: true, breakExcuteIfEmpty }); }
+    /** AND :regexp NOT REGEXP key */
+    notRegexp2(key, regexp, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._2(key, regexp, 'REGEXP', { paramName, skipEmptyString: true, not: 'NOT', breakExcuteIfEmpty }); }
+    /** AND (key1 << 8) + key2 = value */
+    shiftEq(key1, key2, value, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._shift(key1, key2, value, '=', { paramName, breakExcuteIfEmpty }); }
+    /** AND (key1 << 8) + key2 <> value */
+    shiftNotEq(key1, key2, value, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._shift(key1, key2, value, '<>', { paramName, breakExcuteIfEmpty }); }
     /** AND key LIKE CONCAT('%', :value, '%') */
     like(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', right: '%', breakExcuteIfEmpty }); }
     /** AND key NOT LIKE CONCAT('%', :value, '%') */
@@ -3599,29 +3561,61 @@ class StreamQuery {
     rightLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, right: '%', breakExcuteIfEmpty }); }
     /** AND key NOT LIKE CONCAT(:value, '%') */
     notRightLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, right: '%', not: 'NOT', breakExcuteIfEmpty }); }
-    /** AND key NOT LIKE :value */
+    /** AND key LIKE :value 注意：不会拼接% */
     PreciseLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, breakExcuteIfEmpty }); }
-    /** AND key LIKE :value */
+    /** AND key NOT LIKE :value 注意：不会拼接%*/
     notPreciseLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfEmpty }); }
-    /** AND key GLOB CONCAT('%', :value, '%') */
+    /** AND key GLOB CONCAT('%', :value, '%') 注意：GLOB是大小写敏感like */
     glob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', right: '%', breakExcuteIfEmpty, op: 'GLOB' }); }
-    /** AND key NOT GLOB CONCAT('%', :value, '%') */
+    /** AND key NOT GLOB CONCAT('%', :value, '%') 注意：GLOB是大小写敏感like*/
     notGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', right: '%', not: 'NOT', breakExcuteIfEmpty, op: 'GLOB' }); }
-    /** AND key GLOB CONCAT('%', :value) */
+    /** AND key GLOB CONCAT('%', :value) 注意：GLOB是大小写敏感like*/
     leftGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', breakExcuteIfEmpty, op: 'GLOB' }); }
-    /** AND key NOT GLOB CONCAT('%', :value) */
+    /** AND key NOT GLOB CONCAT('%', :value) 注意：GLOB是大小写敏感like*/
     notLeftGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', not: 'NOT', breakExcuteIfEmpty, op: 'GLOB' }); }
-    /** AND key GLOB CONCAT(:value, '%') */
+    /** AND key GLOB CONCAT(:value, '%') 注意：GLOB是大小写敏感like*/
     rightGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, right: '%', breakExcuteIfEmpty, op: 'GLOB' }); }
-    /** AND key NOT GLOB CONCAT(:value, '%') */
+    /** AND key NOT GLOB CONCAT(:value, '%') 注意：GLOB是大小写敏感like*/
     notRightGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, right: '%', not: 'NOT', breakExcuteIfEmpty, op: 'GLOB' }); }
-    /** AND key GLOB :value */
-    PreciseGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, breakExcuteIfEmpty, op: 'GLOB' }); }
-    /** AND key NOT GLOB :value */
+    /** AND key GLOB :value 注意：GLOB是大小写敏感like,这里不拼接%*/
+    preciseGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, breakExcuteIfEmpty, op: 'GLOB' }); }
+    /** AND key NOT GLOB :value 注意：GLOB是大小写敏感like,这里不拼接%*/
     notPreciseGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfEmpty, op: 'GLOB' }); }
-    /** AND key IN :value */
+    /** AND :value LIKE CONCAT('%', key, '%') */
+    like2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like2(key, value, { paramName, skipEmptyString, left: '%', right: '%', breakExcuteIfEmpty }); }
+    /** AND :value NOT LIKE CONCAT('%', key, '%') */
+    notLike2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like2(key, value, { paramName, skipEmptyString, left: '%', right: '%', not: 'NOT', breakExcuteIfEmpty }); }
+    /** AND :value NOT LIKE CONCAT('%', key) */
+    leftLike2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like2(key, value, { paramName, skipEmptyString, left: '%', breakExcuteIfEmpty }); }
+    /** AND :value LIKE CONCAT('%', key) */
+    notLeftLike2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like2(key, value, { paramName, skipEmptyString, left: '%', not: 'NOT', breakExcuteIfEmpty }); }
+    /** AND :value LIKE CONCAT(key, '%') */
+    rightLike2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like2(key, value, { paramName, skipEmptyString, right: '%', breakExcuteIfEmpty }); }
+    /** AND :value NOT LIKE CONCAT(key, '%') */
+    notRightLike2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like2(key, value, { paramName, skipEmptyString, right: '%', not: 'NOT', breakExcuteIfEmpty }); }
+    /** AND :value LIKE key 注意：不会拼接% */
+    PreciseLike2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like2(key, value, { paramName, skipEmptyString, breakExcuteIfEmpty }); }
+    /** AND :value NOT LIKE key 注意：不会拼接%*/
+    notPreciseLike2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like2(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfEmpty }); }
+    /** AND :value GLOB CONCAT('%', key, '%') 注意：GLOB是大小写敏感like */
+    glob2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like2(key, value, { paramName, skipEmptyString, left: '%', right: '%', breakExcuteIfEmpty, op: 'GLOB' }); }
+    /** AND :value NOT GLOB CONCAT('%', key, '%') 注意：GLOB是大小写敏感like*/
+    notGlob2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like2(key, value, { paramName, skipEmptyString, left: '%', right: '%', not: 'NOT', breakExcuteIfEmpty, op: 'GLOB' }); }
+    /** AND :value GLOB CONCAT('%', key) 注意：GLOB是大小写敏感like*/
+    leftGlob2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like2(key, value, { paramName, skipEmptyString, left: '%', breakExcuteIfEmpty, op: 'GLOB' }); }
+    /** AND :value NOT GLOB CONCAT('%', key) 注意：GLOB是大小写敏感like*/
+    notLeftGlob2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like2(key, value, { paramName, skipEmptyString, left: '%', not: 'NOT', breakExcuteIfEmpty, op: 'GLOB' }); }
+    /** AND :value GLOB CONCAT(key, '%') 注意：GLOB是大小写敏感like*/
+    rightGlob2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like2(key, value, { paramName, skipEmptyString, right: '%', breakExcuteIfEmpty, op: 'GLOB' }); }
+    /** AND :value NOT GLOB CONCAT(key, '%') 注意：GLOB是大小写敏感like*/
+    notRightGlob2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like2(key, value, { paramName, skipEmptyString, right: '%', not: 'NOT', breakExcuteIfEmpty, op: 'GLOB' }); }
+    /** AND :value GLOB key 注意：GLOB是大小写敏感like,这里不拼接%*/
+    preciseGlob2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like2(key, value, { paramName, skipEmptyString, breakExcuteIfEmpty, op: 'GLOB' }); }
+    /** AND :value NOT GLOB key 注意：GLOB是大小写敏感like,这里不拼接%*/
+    notPreciseGlob2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._like2(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfEmpty, op: 'GLOB' }); }
+    /** AND key IN (:value) */
     in(key, value, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._in(key, value, { paramName, breakExcuteIfEmpty }); }
-    /** AND key NOT IN :value */
+    /** AND key NOT IN (:value) */
     notIn(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._in(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfEmpty }); }
     /** AND :value IN (key1, key2, ...) */
     in2(key, value, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._in2(key, value, { paramName, breakExcuteIfEmpty }); }
@@ -3633,12 +3627,12 @@ class StreamQuery {
     isNotNULL(key) { return this._null(key, 'NOT'); }
     /** AND (key IS NULL OR key = '') */
     isEmpty(key) {
-        this._wheres.push(`AND (${this[_fields][String(key)]?.C2()} IS NULL OR ${this[_fields][String(key)]?.C2()} = '')`);
+        this._wheres.push(`AND (t.${this[_fields][String(key)]?.C2()} IS NULL OR t.${this[_fields][String(key)]?.C2()} = '')`);
         return this;
     }
     /** AND key IS NOT NULL AND key <> ''*/
     isNotEmpty(key) {
-        this._wheres.push(`AND ${this[_fields][String(key)]?.C2()} IS NOT NULL AND ${this[_fields][String(key)]?.C2()} <> ''`);
+        this._wheres.push(`AND t.${this[_fields][String(key)]?.C2()} IS NOT NULL AND t.${this[_fields][String(key)]?.C2()} <> ''`);
         return this;
     }
     /** AND key BETWEEN :value1 AND :value2 */
@@ -3649,26 +3643,34 @@ class StreamQuery {
     pow(key, value, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._pow(key, value, { paramName, breakExcuteIfEmpty }); }
     /** AND NOT POW(2, key) & :value */
     notPow(key, value, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._pow(key, value, { paramName, not: 'NOT', breakExcuteIfEmpty }); }
+    /** AND POW(2, :value) & key */
+    pow2(key, value, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._pow2(key, value, { paramName, breakExcuteIfEmpty }); }
+    /** AND NOT POW(2, :value) & key */
+    notPow2(key, value, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._pow2(key, value, { paramName, not: 'NOT', breakExcuteIfEmpty }); }
     /** AND POW(2, key1) & key2 */
     powWith(key, values, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._pow(key, add(...values.map(value => Math.pow(2, +value))), { paramName, breakExcuteIfEmpty }); }
     /** AND NOT POW(2, key1) & key2 */
     notPowWith(key, values, { paramName = '', breakExcuteIfEmpty = true } = {}) { return this._pow(key, add(...values.map(value => Math.pow(2, +value))), { paramName, not: 'NOT', breakExcuteIfEmpty }); }
-    /** AND MATCH(key1, key2, key3) AGAINST (:value) */
+    /** AND MATCH(key1, key2, key3...) AGAINST (:value) */
     match(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._match(value, keys, { paramName, skipEmptyString, breakExcuteIfEmpty }); }
-    /** AND NOT MATCH(key1, key2, key3) AGAINST (:value) */
+    /** AND NOT MATCH(key1, key2, key3...) AGAINST (:value) */
     notMatch(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._match(value, keys, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfEmpty }); }
-    /** AND MATCH(key1, key2, key3) AGAINST (:value) IN BOOLEAN MODE*/
+    /** AND MATCH(key1, key2, key3...) AGAINST (:value) IN BOOLEAN MODE*/
     matchBoolean(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._match(value, keys, { paramName, skipEmptyString, breakExcuteIfEmpty, append: 'IN BOOLEAN MODE' }); }
-    /** AND NOT MATCH(key1, key2, key3) AGAINST (:value) IN BOOLEAN MODE */
+    /** AND NOT MATCH(key1, key2, key3...) AGAINST (:value) IN BOOLEAN MODE */
     notMatchBoolean(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._match(value, keys, { paramName, skipEmptyString, breakExcuteIfEmpty, not: 'NOT', append: 'IN BOOLEAN MODE' }); }
-    /** AND MATCH(key1, key2, key3) AGAINST (:value) WITH QUERY EXPANSION*/
+    /** AND MATCH(key1, key2, key3...) AGAINST (:value) WITH QUERY EXPANSION*/
     matchQuery(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._match(value, keys, { paramName, skipEmptyString, breakExcuteIfEmpty, append: 'WITH QUERY EXPANSION' }); }
-    /** AND NOT MATCH(key1, key2, key3) AGAINST (:value) WITH QUERY EXPANSION*/
+    /** AND NOT MATCH(key1, key2, key3...) AGAINST (:value) WITH QUERY EXPANSION*/
     notMatchQuery(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._match(value, keys, { paramName, skipEmptyString, breakExcuteIfEmpty, not: 'NOT', append: 'WITH QUERY EXPANSION' }); }
-    /** AND NOT LOCATE(key, :value) > 0 */
+    /** AND LOCATE(key, :value) > 0 */
     includes(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._includes(key, value, { paramName, skipEmptyString, breakExcuteIfEmpty }); }
     /** AND NOT LOCATE(key, :value) = 0 */
     notIncludes(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._includes(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfEmpty }); }
+    /** AND LOCATE(:value, key) > 0 */
+    includes2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._includes2(key, value, { paramName, skipEmptyString, breakExcuteIfEmpty }); }
+    /** AND NOT LOCATE(:value, key) = 0 */
+    notIncludes2(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) { return this._includes2(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfEmpty }); }
     /** AND FIND_IN_SET(:value, key) */
     findInSet(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) {
         if (value === null
@@ -3684,7 +3686,7 @@ class StreamQuery {
         }
         else {
             const pkey = `p${this._prefix}${this._index++}`;
-            this._wheres.push(`AND FIND_IN_SET(:${pkey}, ${this[_fields][String(key)]?.C2()})`);
+            this._wheres.push(`AND FIND_IN_SET(:${pkey}, t.${this[_fields][String(key)]?.C2()})`);
             this._param[pkey] = value;
             if (paramName) {
                 this._paramKeys[paramName] = pkey;
@@ -3707,7 +3709,7 @@ class StreamQuery {
         }
         else {
             const pkey = `p${this._prefix}${this._index++}`;
-            this._wheres.push(`AND FIND_IN_SET(${this[_fields][String(key)]?.C2()}, :${pkey})`);
+            this._wheres.push(`AND FIND_IN_SET(t.${this[_fields][String(key)]?.C2()}, :${pkey})`);
             this._param[pkey] = value;
             if (paramName) {
                 this._paramKeys[paramName] = pkey;
@@ -3741,51 +3743,73 @@ class StreamQuery {
         }
         return this;
     }
+    /**
+     * sql WHERE 查询语句拼接：注意若有JOIN，需要写明别名。本表别名为t.例如:
+     * ```
+     * where('t.name > :name', {name: 1});
+     * where('(t.name > :name OR t.name <> :name)', {name: 1});
+     * ```
+     */
+    where(sql, param) {
+        this._wheres.push(`AND ${sql}`);
+        if (param) {
+            Object.assign(this._param, param);
+        }
+        return this;
+    }
     /** SET key = IFNULL(key, 0) + :value */
     incr(key, value = 1) {
         const pkey = `p${this._prefix}${this._index++}`;
         const keyName = this[_fields][String(key)]?.C2();
-        this._updateColumns.push(`${keyName} = IFNULL(${keyName}, 0) + :${pkey}`);
+        this._updateColumns.push(`t.${keyName} = IFNULL(t.${keyName}, 0) + :${pkey}`);
         this._param[pkey] = value;
         return this;
     }
     /** GROUP BY key1, key2, ... */
-    groupBy(...keys) { this._groups.push(...keys.map(key => `${this[_fields][String(key)]?.C2()}`)); return this; }
+    groupBy(...keys) { this._groups.push(...keys.map(key => `t.${this[_fields][String(key)]?.C2()}`)); return this; }
     /** GROUP BY key1, key2, ... */
-    groupBy2(...keys) { this._groups.push(...keys.map(key => `${this[_fields][String(key)]?.C2()}`)); return this; }
+    groupBy2(...keys) { this._groups.push(...keys.map(key => `t.${this[_fields][String(key)]?.C2()}`)); return this; }
     /** ORDER BY key1 ASC, key2 ASC, ... */
-    asc(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} ASC`)); return this; }
+    asc(...keys) { this._orders.push(...keys.map(key => `t.${this[_fields][String(key)]?.C2()} ASC`)); return this; }
     /** ORDER BY key1 ASC, key2 ASC, ... */
-    asc2(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} ASC`)); return this; }
+    asc2(...keys) { this._orders.push(...keys.map(key => `t.${this[_fields][String(key)]?.C2()} ASC`)); return this; }
     /** ORDER BY key1 DESC, key2 DESC, ... */
-    desc(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} DESC`)); return this; }
+    desc(...keys) { this._orders.push(...keys.map(key => `t.${this[_fields][String(key)]?.C2()} DESC`)); return this; }
     /** ORDER BY key1 DESC, key2 DESC, ... */
-    desc2(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} ASC`)); return this; }
+    desc2(...keys) { this._orders.push(...keys.map(key => `t.${this[_fields][String(key)]?.C2()} ASC`)); return this; }
     /** LIMIT :startRow, :pageSize */
     limit(startRow, pageSize) { this._startRow = startRow; this._pageSize = pageSize; return this; }
     /** LIMIT ((:pageNumber || 1) - 1) * :pageSize, :pageSize */
     page(pageNumber, pageSize) { this._startRow = ((pageNumber || 1) - 1) * pageSize; this._pageSize = pageSize; return this; }
     distinct(on = true) { this._distinct = on; return this; }
     /** COUNT(DISTINCT key) */
-    countDistinct(key, countName) { this._columns.push(`COUNT(DISTINCT ${this[_fields][String(key)]?.C2()}) ${countName || `${this[_fields][String(key)]?.C2()}`}`); return this; }
+    countDistinct(key, countName) { this._columns.push(`COUNT(DISTINCT t.${this[_fields][String(key)]?.C2()}) ${countName || `t.${this[_fields][String(key)]?.C2()}`}`); return this; }
     count(countName) { this._columns.push(`COUNT(1) ${countName ?? 'ct'}`); return this; }
-    sum(key, legName, distinct) { this._columns.push(`SUM(${distinct ? 'DISTINCT' : ''} ${this[_fields][String(key)]?.C2()}) ${legName || `${this[_fields][String(key)]?.C2()}`}`); return this; }
-    avg(key, legName, distinct) { this._columns.push(`AVG(${distinct ? 'DISTINCT' : ''} ${this[_fields][String(key)]?.C2()}) ${legName || `${this[_fields][String(key)]?.C2()}`}`); return this; }
-    max(key, legName, distinct) { this._columns.push(`MAX(${distinct ? 'DISTINCT' : ''} ${this[_fields][String(key)]?.C2()}) ${legName || `${this[_fields][String(key)]?.C2()}`}`); return this; }
-    min(key, legName, distinct) { this._columns.push(`MIN(${distinct ? 'DISTINCT' : ''} ${this[_fields][String(key)]?.C2()}) ${legName || `${this[_fields][String(key)]?.C2()}`}`); return this; }
+    sum(key, legName, distinct) { this._columns.push(`SUM(${distinct ? 'DISTINCT' : ''} t.${this[_fields][String(key)]?.C2()}) ${legName || `t.${this[_fields][String(key)]?.C2()}`}`); return this; }
+    avg(key, legName, distinct) { this._columns.push(`AVG(${distinct ? 'DISTINCT' : ''} t.${this[_fields][String(key)]?.C2()}) ${legName || `t.${this[_fields][String(key)]?.C2()}`}`); return this; }
+    max(key, legName, distinct) { this._columns.push(`MAX(${distinct ? 'DISTINCT' : ''} t.${this[_fields][String(key)]?.C2()}) ${legName || `t.${this[_fields][String(key)]?.C2()}`}`); return this; }
+    min(key, legName, distinct) { this._columns.push(`MIN(${distinct ? 'DISTINCT' : ''} t.${this[_fields][String(key)]?.C2()}) ${legName || `t.${this[_fields][String(key)]?.C2()}`}`); return this; }
     /** GROUP_CONCAT([DISTINCT] key [ORDER BY :asc ASC] [ORDER BY :asc DESC] [SEPARATOR :separator]) */
     groupConcat(key, param) {
         this._columns.push(`GROUP_CONCAT(
-            ${param && param.distinct ? 'DISTINCT' : ''} ${this[_fields][String(key)]?.C2()}
-            ${param && param.asc && param.asc.length > 0 ? `ORDER BY ${param.asc.map(i => `${this[_fields][String(i)]?.C2()} ASC`)} ` : ''}
-            ${param && param.desc && param.desc.length > 0 ? `${param && param.asc && param.asc.length > 0 ? '' : 'ORDER BY'} ${param.desc.map(i => `${this[_fields][String(i)]?.C2()} DESC`)} ` : ''}
+            ${param && param.distinct ? 'DISTINCT' : ''} t.${this[_fields][String(key)]?.C2()}
+            ${param && param.asc && param.asc.length > 0 ? `ORDER BY ${param.asc.map(i => `t.${this[_fields][String(i)]?.C2()} ASC`)} ` : ''}
+            ${param && param.desc && param.desc.length > 0 ? `${param && param.asc && param.asc.length > 0 ? '' : 'ORDER BY'} ${param.desc.map(i => `t.${this[_fields][String(i)]?.C2()} DESC`)} ` : ''}
             SEPARATOR '${param && param.separator || ','}'
-            ) ${param && param.groupName || `${this[_fields][String(key)]?.C2()}`}`);
+            ) ${param && param.groupName || `t.${this[_fields][String(key)]?.C2()}`}`);
         return this;
     }
-    select(...key) { this._columns.push(...(key.map(k => this[_fields][String(k)].C3()))); return this; }
+    select(...key) { this._columns.push(...(key.map(k => `t.${this[_fields][String(k)].C3()}`))); return this; }
+    /**
+     * sql查询语句拼接：注意若有JOIN，需要写明别名。本表别名为t.例如:
+     * ```
+     * select2('t.name, t.age, ISNULL(t.type, :type)', {type: 1});
+     * select2('MAX(t.age) MAXAge');
+     * ```
+     */
     select2(sql, param) { this._columns.push(`${sql}`); Object.assign(this._param, param); return this; }
     update(key, value) { this._updates ?? (this._updates = {}); this._updates[this[_fields][String(key)]?.C2()] = value; return this; }
+    /** update语句拼接：注意若有JOIN，需要写明别名。本表别名为t */
     update2(sql, param) { this._updateColumns.push(sql); Object.assign(this._param, param); return this; }
     updateT(t) {
         this._updates ?? (this._updates = {});
@@ -3798,7 +3822,7 @@ class StreamQuery {
     /** SET key = REPLACE(key, :valueToFind,  :valueToReplace) */
     replace(key, valueToFind, valueToReplace) {
         const [pkey1, pkey2] = [`p${this._prefix}${this._index++}`, `p${this._prefix}${this._index++}`];
-        this._updateColumns.push(` ${this[_fields][String(key)]?.C2()} = REPLACE(${this[_fields][String(key)]?.C2()}, :${pkey1}, :${pkey2}) `);
+        this._updateColumns.push(` t.${this[_fields][String(key)]?.C2()} = REPLACE(t.${this[_fields][String(key)]?.C2()}, :${pkey1}, :${pkey2}) `);
         this._param[pkey1] = valueToFind;
         this._param[pkey2] = valueToReplace;
         return this;
@@ -3810,8 +3834,8 @@ class StreamQuery {
         const { where, params } = this._where();
         let sql = `
             SELECT
-            ${this._distinct ? 'DISTINCT' : ''} ${this._columns && this._columns.length > 0 ? this._columns.join(',') : this[_columns].map(key => this[_fields][String(key)]?.C3()).join(',')}
-            FROM ${option.tableName ?? this._service[_tableName]}
+            ${this._distinct ? 'DISTINCT' : ''} ${this._columns && this._columns.length > 0 ? this._columns.join(',') : this[_columns].map(key => `t.${this[_fields][String(key)]?.C3()}`).join(',')}
+            FROM ${option.tableName ?? this._service[_tableName]} t
             ${where ? ' WHERE ' : ''}
             ${where}
             ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
@@ -3827,8 +3851,6 @@ class StreamQuery {
             switch (option.selectResult) {
                 case SelectResult.RS_CS: return this._service.select({ ...option, sync: SyncMode.Async, selectResult: SelectResult.RS_CS, sql, params });
                 case SelectResult.RS_C: return this._service.select({ ...option, sync: SyncMode.Async, selectResult: SelectResult.RS_C, sql, params });
-                case SelectResult.RS_CS_List: return this._service.select({ ...option, sync: SyncMode.Async, selectResult: SelectResult.RS_CS_List, sql, params });
-                case SelectResult.RS_C_List: return this._service.select({ ...option, sync: SyncMode.Async, selectResult: SelectResult.RS_C_List, sql, params });
                 case SelectResult.R_CS_Assert: return this._service.select({ ...option, sync: SyncMode.Async, selectResult: SelectResult.R_CS_Assert, sql, params });
                 case SelectResult.R_C_Assert: return this._service.select({ ...option, sync: SyncMode.Async, selectResult: SelectResult.R_C_Assert, sql, params });
                 case SelectResult.R_CS_NotSure: return this._service.select({ ...option, sync: SyncMode.Async, selectResult: SelectResult.R_CS_NotSure, sql, params });
@@ -3839,8 +3861,6 @@ class StreamQuery {
             switch (option.selectResult) {
                 case SelectResult.RS_CS: return this._service.select({ ...option, sync: SyncMode.Sync, selectResult: SelectResult.RS_CS, sql, params });
                 case SelectResult.RS_C: return this._service.select({ ...option, sync: SyncMode.Sync, selectResult: SelectResult.RS_C, sql, params });
-                case SelectResult.RS_CS_List: return this._service.select({ ...option, sync: SyncMode.Sync, selectResult: SelectResult.RS_CS_List, sql, params });
-                case SelectResult.RS_C_List: return this._service.select({ ...option, sync: SyncMode.Sync, selectResult: SelectResult.RS_C_List, sql, params });
                 case SelectResult.R_CS_Assert: return this._service.select({ ...option, sync: SyncMode.Sync, selectResult: SelectResult.R_CS_Assert, sql, params });
                 case SelectResult.R_C_Assert: return this._service.select({ ...option, sync: SyncMode.Sync, selectResult: SelectResult.R_C_Assert, sql, params });
                 case SelectResult.R_CS_NotSure: return this._service.select({ ...option, sync: SyncMode.Sync, selectResult: SelectResult.R_CS_NotSure, sql, params });
@@ -3859,8 +3879,8 @@ class StreamQuery {
         };
         let sql = `
             SELECT
-            ${this._distinct ? 'DISTINCT' : ''} ${this._columns && this._columns.length > 0 ? this._columns.join(',') : this[_columns].map(key => this[_fields][String(key)]?.C3()).join(',')}
-            FROM ${option.tableName ?? this._service[_tableName]}
+            ${this._distinct ? 'DISTINCT' : ''} ${this._columns && this._columns.length > 0 ? this._columns.join(',') : this[_columns].map(key => `t.${this[_fields][String(key)]?.C3()}`).join(',')}
+            FROM ${option.tableName ?? this._service[_tableName]} t
             ${where ? ' WHERE ' : ''}
             ${where}
             ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
@@ -3874,7 +3894,7 @@ class StreamQuery {
         }
         const sqlCount = `
             SELECT COUNT(1)
-            FROM ${option.tableName ?? this._service[_tableName]}
+            FROM ${option.tableName ?? this._service[_tableName]} t
             ${where ? ' WHERE ' : ''}
             ${where}
             ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
@@ -3940,12 +3960,12 @@ class StreamQuery {
         if (this._updates) {
             for (const [K, V] of Object.entries(this._updates)) {
                 const pkey = `p${this._prefix}${this._index++}`;
-                sets.push(` ${K} = :${pkey} `);
+                sets.push(` t.${K} = :${pkey} `);
                 params[pkey] = V;
             }
         }
         if (sets.length > 0) {
-            const sql = `UPDATE ${option.tableName ?? this._service[_tableName]} SET ${sets.join(',')}
+            const sql = `UPDATE ${option.tableName ?? this._service[_tableName]} t SET ${sets.join(',')}
             ${where ? ' WHERE ' : ''}
             ${where}
             `;
@@ -3964,15 +3984,20 @@ class StreamQuery {
         option ?? (option = {});
         option.sync ?? (option.sync = SyncMode.Async);
         const { where, params } = this._where();
-        // const sql = `DELETE FROM ${option.tableName ?? this._service[_tableName]}
-        //     ${where ? ' WHERE ' : ''}
-        //     ${where}
-        // `;
+        const sql = `DELETE FROM ${option.tableName ?? this._service[_tableName]} t
+            ${where ? ' WHERE ' : ''}
+            ${where}
+        `;
+        // if (option.sync === SyncMode.Async) {
+        //     return this._service.delete({ ...option, sync: SyncMode.Async, whereSql: where, whereParams: params });
+        // } else {
+        //     return this._service.delete({ ...option, sync: SyncMode.Sync, whereSql: where, whereParams: params });
+        // }
         if (option.sync === SyncMode.Async) {
-            return this._service.delete({ ...option, sync: SyncMode.Async, whereSql: where, whereParams: params });
+            return this._service.excute({ ...option, sync: SyncMode.Async, sql, params });
         }
         else {
-            return this._service.delete({ ...option, sync: SyncMode.Sync, whereSql: where, whereParams: params });
+            return this._service.excute({ ...option, sync: SyncMode.Sync, sql, params });
         }
     }
     _where() {
@@ -4015,7 +4040,29 @@ class StreamQuery {
         }
         else {
             const pkey = `p${this._prefix}${this._index++}`;
-            this._wheres.push(`AND ${this[_fields][String(key)]?.C2()} ${not} ${op} :${pkey} `);
+            this._wheres.push(`AND t.${this[_fields][String(key)]?.C2()} ${not} ${op} :${pkey} `);
+            this._param[pkey] = value;
+            if (paramName) {
+                this._paramKeys[paramName] = pkey;
+            }
+        }
+        return this;
+    }
+    _2(key, value, op, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) {
+        if (value === null
+            || value === undefined
+            || (emptyString(`${value ?? ''}`) && skipEmptyString)) {
+            if (breakExcuteIfEmpty) {
+                this.if_exec = false;
+            }
+            return this;
+        }
+        if (paramName !== undefined && this._paramKeys.hasOwnProperty(paramName)) {
+            this._param[this._paramKeys[paramName]] = value;
+        }
+        else {
+            const pkey = `p${this._prefix}${this._index++}`;
+            this._wheres.push(`AND :${pkey} ${not} ${op} t.${this[_fields][String(key)]?.C2()}`);
             this._param[pkey] = value;
             if (paramName) {
                 this._paramKeys[paramName] = pkey;
@@ -4037,7 +4084,7 @@ class StreamQuery {
         }
         else {
             const pkey = `p${this._prefix}${this._index++}`;
-            this._wheres.push(`AND (${keys.map(key => `${this[_fields][String(key)]?.C2()} ${not} ${op} :${pkey} `).join(' OR ')})`);
+            this._wheres.push(`AND (${keys.map(key => `t.${this[_fields][String(key)]?.C2()} ${not} ${op} :${pkey} `).join(' OR ')})`);
             this._param[pkey] = value;
             if (paramName) {
                 this._paramKeys[paramName] = pkey;
@@ -4046,11 +4093,11 @@ class StreamQuery {
         return this;
     }
     _null(key, not = '') {
-        this._wheres.push(`AND ${this[_fields][String(key)]?.C2()} IS ${not} NULL`);
+        this._wheres.push(`AND t.${this[_fields][String(key)]?.C2()} IS ${not} NULL`);
         return this;
     }
     _key(key1, key2, op, not = '') {
-        this._wheres.push(`AND ${this[_fields][String(key1)]?.C2()} ${not} ${op} ${this[_fields][String(key2)]?.C2()} `);
+        this._wheres.push(`AND t.${this[_fields][String(key1)]?.C2()} ${not} ${op} t.${this[_fields][String(key2)]?.C2()} `);
         return this;
     }
     _between(key, value1, value2, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) {
@@ -4071,7 +4118,7 @@ class StreamQuery {
         }
         else {
             const [pkey1, pkey2] = [`p${this._prefix}${this._index++}`, `p${this._prefix}${this._index++}`];
-            this._wheres.push(`AND ${this[_fields][String(key)]?.C2()} ${not} BETWEEN :${pkey1} AND :${pkey2}`);
+            this._wheres.push(`AND t.${this[_fields][String(key)]?.C2()} ${not} BETWEEN :${pkey1} AND :${pkey2}`);
             this._param[pkey1] = value1;
             this._param[pkey2] = value2;
             if (paramName) {
@@ -4090,7 +4137,7 @@ class StreamQuery {
             }
             else {
                 const pkey = `p${this._prefix}${this._index++}`;
-                this._wheres.push(`AND ${this[_fields][String(key)]?.C2()} ${not} IN (:${pkey}) `);
+                this._wheres.push(`AND t.${this[_fields][String(key)]?.C2()} ${not} IN (:${pkey}) `);
                 this._param[pkey] = value;
                 if (paramName) {
                     this._paramKeys[paramName] = pkey;
@@ -4110,7 +4157,7 @@ class StreamQuery {
             }
             else {
                 const pkey = `p${this._prefix}${this._index++}`;
-                this._wheres.push(`AND :${pkey} ${not} IN (${key.map(k => this[_fields][String(k)]?.C2()).join(',')}) `);
+                this._wheres.push(`AND :${pkey} ${not} IN (${key.map(k => `t.${this[_fields][String(k)]?.C2()}`).join(',')}) `);
                 this._param[pkey] = value;
                 if (paramName) {
                     this._paramKeys[paramName] = pkey;
@@ -4136,7 +4183,7 @@ class StreamQuery {
         }
         else {
             const pkey = `p${this._prefix}${this._index++}`;
-            this._wheres.push(`AND (${this[_fields][String(key1)]?.C2()} << 8) + ${this[_fields][String(key2)]?.C2()} ${not} ${op} :${pkey} `);
+            this._wheres.push(`AND (t.${this[_fields][String(key1)]?.C2()} << 8) + t.${this[_fields][String(key2)]?.C2()} ${not} ${op} :${pkey} `);
             this._param[pkey] = value;
             if (paramName) {
                 this._paramKeys[paramName] = pkey;
@@ -4158,7 +4205,7 @@ class StreamQuery {
         }
         else {
             const pkey = `p${this._prefix}${this._index++}`;
-            this._wheres.push(`AND ${not} MATCH(${keys.map(key => this[_fields][String(key)]?.C2()).join(',')}) AGAINST (:${pkey} ${append ?? ''})`);
+            this._wheres.push(`AND ${not} MATCH(${keys.map(key => `t.${this[_fields][String(key)]?.C2()}`).join(',')}) AGAINST (:${pkey} ${append ?? ''})`);
             this._param[pkey] = value;
             if (paramName) {
                 this._paramKeys[paramName] = pkey;
@@ -4180,7 +4227,29 @@ class StreamQuery {
         }
         else {
             const pkey = `p${this._prefix}${this._index++}`;
-            this._wheres.push(`AND ${not} POW(2, ${this[_fields][String(key)]?.C2()}) & :${pkey}`);
+            this._wheres.push(`AND ${not} POW(2, t.${this[_fields][String(key)]?.C2()}) & :${pkey}`);
+            this._param[pkey] = value;
+            if (paramName) {
+                this._paramKeys[paramName] = pkey;
+            }
+        }
+        return this;
+    }
+    _pow2(key, value, { not = '', paramName = '', breakExcuteIfEmpty = true } = {}) {
+        if (value === null
+            || value === undefined
+            || emptyString(`${value ?? ''}`)) {
+            if (breakExcuteIfEmpty) {
+                this.if_exec = false;
+            }
+            return this;
+        }
+        if (paramName !== undefined && this._paramKeys.hasOwnProperty(paramName)) {
+            this._param[this._paramKeys[paramName]] = value;
+        }
+        else {
+            const pkey = `p${this._prefix}${this._index++}`;
+            this._wheres.push(`AND ${not} POW(2, :${pkey}) & t.${this[_fields][String(key)]?.C2()}`);
             this._param[pkey] = value;
             if (paramName) {
                 this._paramKeys[paramName] = pkey;
@@ -4202,7 +4271,29 @@ class StreamQuery {
         }
         else {
             const pkey = `p${this._prefix}${this._index++}`;
-            this._wheres.push(`AND ${this[_fields][String(key)]?.C2()} ${not} ${op} CONCAT('${left}', :${pkey}, '${right}') `);
+            this._wheres.push(`AND t.${this[_fields][String(key)]?.C2()} ${not} ${op} CONCAT('${left}', :${pkey}, '${right}') `);
+            this._param[pkey] = value;
+            if (paramName) {
+                this._paramKeys[paramName] = pkey;
+            }
+        }
+        return this;
+    }
+    _like2(key, value, { not = '', left = '', right = '', paramName = '', op = 'LIKE', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) {
+        if (value === null
+            || value === undefined
+            || (emptyString(`${value ?? ''}`) && skipEmptyString)) {
+            if (breakExcuteIfEmpty) {
+                this.if_exec = false;
+            }
+            return this;
+        }
+        if (paramName !== undefined && this._paramKeys.hasOwnProperty(paramName)) {
+            this._param[this._paramKeys[paramName]] = value;
+        }
+        else {
+            const pkey = `p${this._prefix}${this._index++}`;
+            this._wheres.push(`AND :${pkey} ${not} ${op} CONCAT('${left}',t.${this[_fields][String(key)]?.C2()}, '${right}') `);
             this._param[pkey] = value;
             if (paramName) {
                 this._paramKeys[paramName] = pkey;
@@ -4224,7 +4315,29 @@ class StreamQuery {
         }
         else {
             const pkey = `p${this._prefix}${this._index++}`;
-            this._wheres.push(`AND LOCATE(${this[_fields][String(key)]?.C2()}, :${pkey}) ${not ? '=' : '>'}  0`);
+            this._wheres.push(`AND LOCATE(t.${this[_fields][String(key)]?.C2()}, :${pkey}) ${not ? '=' : '>'}  0`);
+            this._param[pkey] = value;
+            if (paramName) {
+                this._paramKeys[paramName] = pkey;
+            }
+        }
+        return this;
+    }
+    _includes2(key, value, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfEmpty = true } = {}) {
+        if (value === null
+            || value === undefined
+            || (emptyString(`${value ?? ''}`) && skipEmptyString)) {
+            if (breakExcuteIfEmpty) {
+                this.if_exec = false;
+            }
+            return this;
+        }
+        if (paramName !== undefined && this._paramKeys.hasOwnProperty(paramName)) {
+            this._param[this._paramKeys[paramName]] = value;
+        }
+        else {
+            const pkey = `p${this._prefix}${this._index++}`;
+            this._wheres.push(`AND LOCATE(:${pkey}, t.${this[_fields][String(key)]?.C2()}) ${not ? '=' : '>'}  0`);
             this._param[pkey] = value;
             if (paramName) {
                 this._paramKeys[paramName] = pkey;
@@ -4278,75 +4391,87 @@ __decorate([
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, String, Object]),
+    __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamQuery.prototype, "regexp", null);
+], StreamQuery.prototype, "grate", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, String, Object]),
+    __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamQuery.prototype, "notRegexp", null);
+], StreamQuery.prototype, "grateEq", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object, Number, Object]),
+    __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamQuery.prototype, "shiftEq", null);
+], StreamQuery.prototype, "grateWith", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object, Number, Object]),
+    __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamQuery.prototype, "shiftNotEq", null);
+], StreamQuery.prototype, "grateEqWith", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamQuery.prototype, "grate", null);
+], StreamQuery.prototype, "less", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamQuery.prototype, "grateEq", null);
+], StreamQuery.prototype, "lessEq", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamQuery.prototype, "grateWith", null);
+], StreamQuery.prototype, "lessWith", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamQuery.prototype, "grateEqWith", null);
+], StreamQuery.prototype, "lessEqWith", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:paramtypes", [Object, String, Object]),
     __metadata("design:returntype", void 0)
-], StreamQuery.prototype, "less", null);
+], StreamQuery.prototype, "regexp", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:paramtypes", [Object, String, Object]),
     __metadata("design:returntype", void 0)
-], StreamQuery.prototype, "lessEq", null);
+], StreamQuery.prototype, "notRegexp", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:paramtypes", [Object, String, Object]),
     __metadata("design:returntype", void 0)
-], StreamQuery.prototype, "lessWith", null);
+], StreamQuery.prototype, "regexp2", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:paramtypes", [Object, String, Object]),
     __metadata("design:returntype", void 0)
-], StreamQuery.prototype, "lessEqWith", null);
+], StreamQuery.prototype, "notRegexp2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Number, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "shiftEq", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Number, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "shiftNotEq", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
@@ -4436,13 +4561,109 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamQuery.prototype, "PreciseGlob", null);
+], StreamQuery.prototype, "preciseGlob", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
 ], StreamQuery.prototype, "notPreciseGlob", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "like2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "notLike2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "leftLike2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "notLeftLike2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "rightLike2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "notRightLike2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "PreciseLike2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "notPreciseLike2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "glob2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "notGlob2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "leftGlob2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "notLeftGlob2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "rightGlob2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "notRightGlob2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "preciseGlob2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "notPreciseGlob2", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
@@ -4515,6 +4736,18 @@ __decorate([
     __metadata("design:paramtypes", [Object, Number, Object]),
     __metadata("design:returntype", void 0)
 ], StreamQuery.prototype, "notPow", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Number, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "pow2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Number, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "notPow2", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
@@ -4575,6 +4808,18 @@ __decorate([
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
 ], StreamQuery.prototype, "notIncludes", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "includes2", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "notIncludes2", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
@@ -4599,6 +4844,12 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
 ], StreamQuery.prototype, "or", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "where", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),