baja-lite 1.5.18 → 1.5.20

package/sql.d.ts

@@ -1,7 +1,6 @@
 import { ExtensionCodec } from "@msgpack/msgpack";
 import { _columns, _columnsNoId, _def, _deleteState, _fields, _ids, _index, _logicIds, _stateFileName, AField, DBType, EnumMap, FieldOption } from 'baja-lite-field';
 import { XML } from './convert-xml.js';
-import { ArrayList } from './list.js';
 export declare const extensionCodec: ExtensionCodec<undefined>;
 declare const _daoDBName: unique symbol;
 declare const _tableName: unique symbol;
@@ -94,10 +93,8 @@ export declare enum TemplateResult {
     NotSureOne = 1,
     /** 返回多条记录 */
     Many = 2,
-    /** 返回多条记录并封装ArrayList */
-    ManyList = 3,
     /** 仅查询记录数量 */
-    Count = 4
+    Count = 3
 }
 export declare enum SelectResult {
     /** 一行一列 确定非空 */
@@ -110,12 +107,8 @@ export declare enum SelectResult {
     R_CS_NotSure = 3,
     /** 多行一列 */
     RS_C = 4,
-    /** 多行一列并封装ArrayList */
-    RS_C_List = 5,
     /** 多行多列 */
-    RS_CS = 6,
-    /** 多行多列并封装ArrayList */
-    RS_CS_List = 7
+    RS_CS = 5
 }
 export declare enum ColumnMode {
     NONE = 0,
@@ -1068,30 +1061,6 @@ export declare class SqlService<T extends object> {
         error?: string;
         columns?: (keyof L)[];
     }): Promise<L[]>;
-    template<L = T>(option: MethodOption & {
-        sync: SyncMode.Sync;
-        templateResult: TemplateResult.ManyList;
-        id?: string | number | Array<string | number>;
-        where?: Partial<L> | Array<Partial<L>>;
-        skipUndefined?: boolean;
-        skipNull?: boolean;
-        skipEmptyString?: boolean;
-        mode?: SelectMode;
-        error?: string;
-        columns?: (keyof L)[];
-    }): ArrayList<L>;
-    template<L = T>(option: MethodOption & {
-        sync?: SyncMode.Async;
-        templateResult: TemplateResult.ManyList;
-        id?: string | number | Array<string | number>;
-        where?: Partial<L> | Array<Partial<L>>;
-        skipUndefined?: boolean;
-        skipNull?: boolean;
-        skipEmptyString?: boolean;
-        mode?: SelectMode;
-        error?: string;
-        columns?: (keyof L)[];
-    }): Promise<ArrayList<L>>;
     private _select;
     /**
     # 自由查询
@@ -1102,9 +1071,7 @@ export declare class SqlService<T extends object> {
         3. R_CS_Assert,
         4. R_CS_NotSure,
         5. RS_C,
-        6. RS_C_List
         7. RS_CS[默认]
-        8. RS_CS_List
     2. `sql` 或者 `sqlid`
     3. `params`
     4. `defValue`: One_Row_One_Column 时有效
@@ -1151,21 +1118,6 @@ export declare class SqlService<T extends object> {
         mapperIfUndefined?: MapperIfUndefined;
         dataConvert?: Record<string, string>;
     }): Promise<L[]>;
-    select<L = T>(option: MethodOption & {
-        sync?: SyncMode.Async;
-        selectResult: SelectResult.RS_CS_List | SelectResult.RS_C_List;
-        sqlId?: string;
-        sql?: string;
-        params?: Record<string, any>;
-        context?: any;
-        isCount?: boolean;
-        defValue?: L | null;
-        errorMsg?: string;
-        hump?: boolean;
-        mapper?: string | SqlMapper;
-        mapperIfUndefined?: MapperIfUndefined;
-        dataConvert?: Record<string, string>;
-    }): Promise<ArrayList<L>>;
     select<L = T>(option: MethodOption & {
         sync?: SyncMode.Async;
         selectResult: SelectResult.R_CS_Assert | SelectResult.R_C_Assert;
@@ -1211,21 +1163,6 @@ export declare class SqlService<T extends object> {
         mapperIfUndefined?: MapperIfUndefined;
         dataConvert?: Record<string, string>;
     }): L[];
-    select<L = T>(option: MethodOption & {
-        sync: SyncMode.Sync;
-        selectResult: SelectResult.RS_CS_List | SelectResult.RS_C_List;
-        sqlId?: string;
-        sql?: string;
-        params?: Record<string, any>;
-        context?: any;
-        isCount?: boolean;
-        defValue?: L | null;
-        errorMsg?: string;
-        hump?: boolean;
-        mapper?: string | SqlMapper;
-        mapperIfUndefined?: MapperIfUndefined;
-        dataConvert?: Record<string, string>;
-    }): ArrayList<L>;
     select<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
         selectResult: SelectResult.R_CS_Assert | SelectResult.R_C_Assert;
@@ -1291,8 +1228,9 @@ export declare class SqlService<T extends object> {
     // qiniu 在开始时定义
      ```
      */
-    selectMuit<T extends any[] = []>(option: MethodOption & {
+    selectBatch<T extends any[] = []>(option: MethodOption & {
         sync?: SyncMode.Async;
+        selectResult?: SelectResult.RS_CS | SelectResult.RS_C;
         sqlId?: string;
         sql?: string;
         params?: Record<string, any>;
@@ -1304,8 +1242,37 @@ export declare class SqlService<T extends object> {
     }): Promise<{
         [K in keyof T]: T[K][];
     }>;
-    selectMuit<T extends any[] = []>(option: MethodOption & {
+    selectBatch<T extends any[] = []>(option: MethodOption & {
+        sync?: SyncMode.Async;
+        selectResult: SelectResult.R_CS_Assert | SelectResult.R_C_Assert;
+        sqlId?: string;
+        sql?: string;
+        params?: Record<string, any>;
+        context?: any;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
+    }): Promise<{
+        [K in keyof T]: T[K];
+    }>;
+    selectBatch<T extends any[] = []>(option: MethodOption & {
+        sync?: SyncMode.Async;
+        selectResult: SelectResult.R_CS_NotSure | SelectResult.R_C_NotSure;
+        sqlId?: string;
+        sql?: string;
+        params?: Record<string, any>;
+        context?: any;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
+    }): Promise<{
+        [K in keyof T]: T[K] | null;
+    }>;
+    selectBatch<T extends any[] = []>(option: MethodOption & {
         sync: SyncMode.Sync;
+        selectResult?: SelectResult.RS_CS | SelectResult.RS_C;
         sqlId?: string;
         sql?: string;
         params?: Record<string, any>;
@@ -1317,6 +1284,34 @@ export declare class SqlService<T extends object> {
     }): {
         [K in keyof T]: T[K][];
     };
+    selectBatch<T extends any[] = []>(option: MethodOption & {
+        sync: SyncMode.Sync;
+        selectResult: SelectResult.R_CS_Assert | SelectResult.R_C_Assert;
+        sqlId?: string;
+        sql?: string;
+        params?: Record<string, any>;
+        context?: any;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
+    }): {
+        [K in keyof T]: T[K];
+    };
+    selectBatch<T extends any[] = []>(option: MethodOption & {
+        sync: SyncMode.Sync;
+        selectResult: SelectResult.R_CS_NotSure | SelectResult.R_C_NotSure;
+        sqlId?: string;
+        sql?: string;
+        params?: Record<string, any>;
+        context?: any;
+        hump?: boolean;
+        mapper?: string | SqlMapper;
+        mapperIfUndefined?: MapperIfUndefined;
+        dataConvert?: Record<string, string>;
+    }): {
+        [K in keyof T]: T[K] | null;
+    };
     /**
      # 自由执行sql
      0. `sync`: 同步（sqlite）或者异步（mysql、remote），影响返回值类型,默认`异步模式`
@@ -1521,26 +1516,6 @@ declare class StreamQuery<T extends object> {
     eqWith(key1: keyof T, key2: keyof T): this;
     /** AND key1 <> key2 */
     notEqWith(key1: keyof T, key2: keyof T): this;
-    /** AND key REGEXP :regexp */
-    regexp(key: keyof T, regexp: string, { paramName, breakExcuteIfEmpty }?: {
-        paramName?: string | undefined;
-        breakExcuteIfEmpty?: boolean | undefined;
-    }): this;
-    /** AND key NOT REGEXP :regexp */
-    notRegexp(key: keyof T, regexp: string, { paramName, breakExcuteIfEmpty }?: {
-        paramName?: string | undefined;
-        breakExcuteIfEmpty?: boolean | undefined;
-    }): this;
-    /** AND (key1 << 8) + key2 = value */
-    shiftEq(key1: keyof T, key2: keyof T, value: number, { paramName, breakExcuteIfEmpty }?: {
-        paramName?: string | undefined;
-        breakExcuteIfEmpty?: boolean | undefined;
-    }): this;
-    /** AND (key1 << 8) + key2 <> value */
-    shiftNotEq(key1: keyof T, key2: keyof T, value: number, { paramName, breakExcuteIfEmpty }?: {
-        paramName?: string | undefined;
-        breakExcuteIfEmpty?: boolean | undefined;
-    }): this;
     /** AND key > :value */
     grate(key: keyof T, value: string | number, { paramName, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
@@ -1569,6 +1544,36 @@ declare class StreamQuery<T extends object> {
     lessWith(key1: keyof T, key2: keyof T): this;
     /** AND key1 <= key2 */
     lessEqWith(key1: keyof T, key2: keyof T): this;
+    /** AND key REGEXP :regexp */
+    regexp(key: keyof T, regexp: string, { paramName, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND key NOT REGEXP :regexp */
+    notRegexp(key: keyof T, regexp: string, { paramName, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :regexp REGEXP key */
+    regexp2(key: keyof T, regexp: string, { paramName, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :regexp NOT REGEXP key */
+    notRegexp2(key: keyof T, regexp: string, { paramName, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND (key1 << 8) + key2 = value */
+    shiftEq(key1: keyof T, key2: keyof T, value: number, { paramName, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND (key1 << 8) + key2 <> value */
+    shiftNotEq(key1: keyof T, key2: keyof T, value: number, { paramName, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
     /** AND key LIKE CONCAT('%', :value, '%') */
     like(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
@@ -1605,72 +1610,168 @@ declare class StreamQuery<T extends object> {
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key NOT LIKE :value */
+    /** AND key LIKE :value 注意：不会拼接% */
     PreciseLike(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key LIKE :value */
+    /** AND key NOT LIKE :value 注意：不会拼接%*/
     notPreciseLike(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key GLOB CONCAT('%', :value, '%') */
+    /** AND key GLOB CONCAT('%', :value, '%') 注意：GLOB是大小写敏感like */
     glob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key NOT GLOB CONCAT('%', :value, '%') */
+    /** AND key NOT GLOB CONCAT('%', :value, '%') 注意：GLOB是大小写敏感like*/
     notGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key GLOB CONCAT('%', :value) */
+    /** AND key GLOB CONCAT('%', :value) 注意：GLOB是大小写敏感like*/
     leftGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key NOT GLOB CONCAT('%', :value) */
+    /** AND key NOT GLOB CONCAT('%', :value) 注意：GLOB是大小写敏感like*/
     notLeftGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key GLOB CONCAT(:value, '%') */
+    /** AND key GLOB CONCAT(:value, '%') 注意：GLOB是大小写敏感like*/
     rightGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key NOT GLOB CONCAT(:value, '%') */
+    /** AND key NOT GLOB CONCAT(:value, '%') 注意：GLOB是大小写敏感like*/
     notRightGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key GLOB :value */
-    PreciseGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+    /** AND key GLOB :value 注意：GLOB是大小写敏感like,这里不拼接%*/
+    preciseGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key NOT GLOB :value */
+    /** AND key NOT GLOB :value 注意：GLOB是大小写敏感like,这里不拼接%*/
     notPreciseGlob(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key IN :value */
+    /** AND :value LIKE CONCAT('%', key, '%') */
+    like2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value NOT LIKE CONCAT('%', key, '%') */
+    notLike2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value NOT LIKE CONCAT('%', key) */
+    leftLike2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value LIKE CONCAT('%', key) */
+    notLeftLike2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value LIKE CONCAT(key, '%') */
+    rightLike2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value NOT LIKE CONCAT(key, '%') */
+    notRightLike2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value LIKE key 注意：不会拼接% */
+    PreciseLike2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value NOT LIKE key 注意：不会拼接%*/
+    notPreciseLike2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value GLOB CONCAT('%', key, '%') 注意：GLOB是大小写敏感like */
+    glob2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value NOT GLOB CONCAT('%', key, '%') 注意：GLOB是大小写敏感like*/
+    notGlob2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value GLOB CONCAT('%', key) 注意：GLOB是大小写敏感like*/
+    leftGlob2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value NOT GLOB CONCAT('%', key) 注意：GLOB是大小写敏感like*/
+    notLeftGlob2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value GLOB CONCAT(key, '%') 注意：GLOB是大小写敏感like*/
+    rightGlob2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value NOT GLOB CONCAT(key, '%') 注意：GLOB是大小写敏感like*/
+    notRightGlob2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value GLOB key 注意：GLOB是大小写敏感like,这里不拼接%*/
+    preciseGlob2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND :value NOT GLOB key 注意：GLOB是大小写敏感like,这里不拼接%*/
+    notPreciseGlob2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND key IN (:value) */
     in(key: keyof T, value: Array<string | number>, { paramName, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND key NOT IN :value */
+    /** AND key NOT IN (:value) */
     notIn(key: keyof T, value: Array<string | number>, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
@@ -1717,6 +1818,16 @@ declare class StreamQuery<T extends object> {
         paramName?: string | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
+    /** AND POW(2, :value) & key */
+    pow2(key: keyof T, value: number, { paramName, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND NOT POW(2, :value) & key */
+    notPow2(key: keyof T, value: number, { paramName, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
     /** AND POW(2, key1) & key2 */
     powWith(key: keyof T, values: Array<number | string>, { paramName, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
@@ -1727,43 +1838,43 @@ declare class StreamQuery<T extends object> {
         paramName?: string | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND MATCH(key1, key2, key3) AGAINST (:value) */
+    /** AND MATCH(key1, key2, key3...) AGAINST (:value) */
     match(value: string, keys: (keyof T)[], { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND NOT MATCH(key1, key2, key3) AGAINST (:value) */
+    /** AND NOT MATCH(key1, key2, key3...) AGAINST (:value) */
     notMatch(value: string, keys: (keyof T)[], { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND MATCH(key1, key2, key3) AGAINST (:value) IN BOOLEAN MODE*/
+    /** AND MATCH(key1, key2, key3...) AGAINST (:value) IN BOOLEAN MODE*/
     matchBoolean(value: string, keys: (keyof T)[], { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND NOT MATCH(key1, key2, key3) AGAINST (:value) IN BOOLEAN MODE */
+    /** AND NOT MATCH(key1, key2, key3...) AGAINST (:value) IN BOOLEAN MODE */
     notMatchBoolean(value: string, keys: (keyof T)[], { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND MATCH(key1, key2, key3) AGAINST (:value) WITH QUERY EXPANSION*/
+    /** AND MATCH(key1, key2, key3...) AGAINST (:value) WITH QUERY EXPANSION*/
     matchQuery(value: string, keys: (keyof T)[], { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND NOT MATCH(key1, key2, key3) AGAINST (:value) WITH QUERY EXPANSION*/
+    /** AND NOT MATCH(key1, key2, key3...) AGAINST (:value) WITH QUERY EXPANSION*/
     notMatchQuery(value: string, keys: (keyof T)[], { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
-    /** AND NOT LOCATE(key, :value) > 0 */
+    /** AND LOCATE(key, :value) > 0 */
     includes(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
         skipEmptyString?: boolean | undefined;
@@ -1775,6 +1886,18 @@ declare class StreamQuery<T extends object> {
         skipEmptyString?: boolean | undefined;
         breakExcuteIfEmpty?: boolean | undefined;
     }): this;
+    /** AND LOCATE(:value, key) > 0 */
+    includes2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
+    /** AND NOT LOCATE(:value, key) = 0 */
+    notIncludes2(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
+        paramName?: string | undefined;
+        skipEmptyString?: boolean | undefined;
+        breakExcuteIfEmpty?: boolean | undefined;
+    }): this;
     /** AND FIND_IN_SET(:value, key) */
     findInSet(key: keyof T, value: string | number, { paramName, skipEmptyString, breakExcuteIfEmpty }?: {
         paramName?: string | undefined;
@@ -1789,6 +1912,14 @@ declare class StreamQuery<T extends object> {
     }): this;
     and(fn: StreamQuery<T> | ((stream: StreamQuery<T>) => boolean | void)): this;
     or(fn: StreamQuery<T> | ((stream: StreamQuery<T>) => boolean | void)): this;
+    /**
+     * sql WHERE 查询语句拼接：注意若有JOIN，需要写明别名。本表别名为t.例如:
+     * ```
+     * where('t.name > :name', {name: 1});
+     * where('(t.name > :name OR t.name <> :name)', {name: 1});
+     * ```
+     */
+    where(sql: string, param?: Record<string, any>): this;
     /** SET key = IFNULL(key, 0) + :value */
     incr(key: keyof T, value?: number): this;
     /** GROUP BY key1, key2, ... */
@@ -1824,8 +1955,16 @@ declare class StreamQuery<T extends object> {
         groupName?: string;
     }): this;
     select(...key: (keyof T)[]): this;
+    /**
+     * sql查询语句拼接：注意若有JOIN，需要写明别名。本表别名为t.例如:
+     * ```
+     * select2('t.name, t.age, ISNULL(t.type, :type)', {type: 1});
+     * select2('MAX(t.age) MAXAge');
+     * ```
+     */
     select2(sql: string, param?: Record<string, any>): this;
     update(key: keyof T, value: T[keyof T]): this;
+    /** update语句拼接：注意若有JOIN，需要写明别名。本表别名为t */
     update2(sql: string, param?: Record<string, any>): this;
     updateT(t: Partial<T>): this;
     /** SET key = REPLACE(key, :valueToFind,  :valueToReplace) */
@@ -1838,14 +1977,6 @@ declare class StreamQuery<T extends object> {
         mapperIfUndefined?: MapperIfUndefined;
         dataConvert?: Record<string, string>;
     }): Promise<L[]>;
-    excuteSelect<L = T>(option?: MethodOption & {
-        sync?: SyncMode.Async;
-        selectResult?: SelectResult.RS_CS_List | SelectResult.RS_C_List;
-        hump?: boolean;
-        mapper?: string | SqlMapper;
-        mapperIfUndefined?: MapperIfUndefined;
-        dataConvert?: Record<string, string>;
-    }): Promise<ArrayList<L>>;
     excuteSelect<L = T>(option: MethodOption & {
         sync?: SyncMode.Async;
         selectResult: SelectResult.R_CS_Assert | SelectResult.R_C_Assert;
@@ -1871,14 +2002,6 @@ declare class StreamQuery<T extends object> {
         mapperIfUndefined?: MapperIfUndefined;
         dataConvert?: Record<string, string>;
     }): L[];
-    excuteSelect<L = T>(option: MethodOption & {
-        sync: SyncMode.Sync;
-        selectResult: SelectResult.RS_CS_List | SelectResult.RS_C_List;
-        hump?: boolean;
-        mapper?: string | SqlMapper;
-        mapperIfUndefined?: MapperIfUndefined;
-        dataConvert?: Record<string, string>;
-    }): ArrayList<L>;
     excuteSelect<L = T>(option: MethodOption & {
         sync: SyncMode.Sync;
         selectResult: SelectResult.R_CS_Assert | SelectResult.R_C_Assert;
@@ -1925,6 +2048,7 @@ declare class StreamQuery<T extends object> {
     }): number;
     private _where;
     private _;
+    private _2;
     private __;
     private _null;
     private _key;
@@ -1934,8 +2058,11 @@ declare class StreamQuery<T extends object> {
     private _shift;
     private _match;
     private _pow;
+    private _pow2;
     private _like;
+    private _like2;
     private _includes;
+    private _includes2;
 }
 /**
  获取REDIS客户端，