baja-lite 1.0.4 → 1.0.6

package/es/sql.js

@@ -8,8 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 var _a, _b, _c;
-var _d, _e, _f;
-import 'reflect-metadata';
+var _d, _e, _f, _g;
 import { Throw } from './error';
 import tslib from 'tslib';
 import Sqlstring from 'sqlstring';
@@ -17,11 +16,20 @@ import iterare from 'iterare';
 import { emptyString } from './string';
 import pino from 'pino';
 import { excuteSplit, ExcuteSplitMode, sleep } from './fn';
-import { add } from './math';
+import { add, calc } from './math';
 import mustache from 'mustache';
+import { C2P, C2P2, P2C } from './object';
+import { format } from 'sql-formatter';
+import HTML from 'html-parse-stringify';
+import { convert } from './convert-xml';
+import { ArrayList } from './list';
+import LGet from 'lodash.get';
 // #region 常量
 const _daoDBName = Symbol('dbName');
 const _tableName = Symbol('tableName');
+const _className = Symbol('className');
+const _ClassName = Symbol('ClassName');
+const _vueName = Symbol('vueName');
 const _ids = Symbol('ids');
 const _columns = Symbol('columns');
 const _columnsNoId = Symbol('columnsNoId');
@@ -31,9 +39,9 @@ const _deleteState = Symbol('deleteState');
 const _transformer = Symbol('transformer');
 const _index = Symbol('index');
 const _def = Symbol('def');
-const _sqlCache = Symbol('sqlMap');
-const _dao = Symbol('dao');
-const _primaryDB = Symbol('primaryDB');
+export const _sqlCache = Symbol('sqlMap');
+export const _dao = Symbol('dao');
+export const _primaryDB = Symbol('primaryDB');
 const _dbType = Symbol('dbType');
 const _sqlite_version = Symbol('sqlite_version');
 const _daoConnection = Symbol('daoConnection');
@@ -41,16 +49,20 @@ const _inTransaction = Symbol('inTransaction');
 const _daoDB = Symbol('daoDB');
 const _sqliteRemoteName = Symbol('sqliteRemoteName');
 const _SqlOption = Symbol('SqlOption');
-const _GlobalSqlOption = Symbol('GlobalSqlOption');
-const _EventBus = Symbol('EventBus');
-const _path = Symbol('path');
-const _fs = Symbol('fs');
-const logger = pino({
+const _resultMap = Symbol('resultMap');
+const _resultMap_SQLID = Symbol('resultMap_SQLID');
+export const _Hump = Symbol('Hump');
+export const _GlobalSqlOption = Symbol('GlobalSqlOption');
+export const _EventBus = Symbol('EventBus');
+export const _path = Symbol('path');
+export const _fs = Symbol('fs');
+export const logger = process.env['NODE_ENV'] !== 'production' ? pino({
     name: 'sql',
     transport: {
         target: 'pino-pretty'
     }
-});
+}) : pino({ name: 'sql' });
+globalThis[_resultMap_SQLID] = {};
 // #endregion
 // #region 可选配置
 export var DBType;
@@ -62,6 +74,15 @@ export var DBType;
     DBType[DBType["Redis"] = 4] = "Redis";
     DBType[DBType["RedisLock"] = 5] = "RedisLock";
 })(DBType || (DBType = {}));
+;
+export var MapperIfUndefined;
+(function (MapperIfUndefined) {
+    MapperIfUndefined[MapperIfUndefined["Null"] = 0] = "Null";
+    MapperIfUndefined[MapperIfUndefined["Skip"] = 1] = "Skip";
+    MapperIfUndefined[MapperIfUndefined["Zero"] = 2] = "Zero";
+    MapperIfUndefined[MapperIfUndefined["EmptyString"] = 3] = "EmptyString";
+})(MapperIfUndefined || (MapperIfUndefined = {}));
+;
 export var SyncMode;
 (function (SyncMode) {
     /** 同步执行 */
@@ -138,17 +159,29 @@ export var TemplateResult;
     TemplateResult[TemplateResult["NotSureOne"] = 1] = "NotSureOne";
     /** 返回多条记录 */
     TemplateResult[TemplateResult["Many"] = 2] = "Many";
+    /** 返回多条记录并封装ArrayList */
+    TemplateResult[TemplateResult["ManyList"] = 3] = "ManyList";
     /** 仅查询记录数量 */
-    TemplateResult[TemplateResult["Count"] = 3] = "Count";
+    TemplateResult[TemplateResult["Count"] = 4] = "Count";
 })(TemplateResult || (TemplateResult = {}));
 export var SelectResult;
 (function (SelectResult) {
-    SelectResult[SelectResult["One_Row_One_Column_Assert"] = 0] = "One_Row_One_Column_Assert";
-    SelectResult[SelectResult["One_Row_One_Column_NotSure"] = 1] = "One_Row_One_Column_NotSure";
-    SelectResult[SelectResult["One_Row_Many_Column_Assert"] = 2] = "One_Row_Many_Column_Assert";
-    SelectResult[SelectResult["One_Row_Many_Column_NotSure"] = 3] = "One_Row_Many_Column_NotSure";
-    SelectResult[SelectResult["Many_Row_One_Column"] = 4] = "Many_Row_One_Column";
-    SelectResult[SelectResult["Many_Row_Many_Column"] = 5] = "Many_Row_Many_Column";
+    /** 一行一列 确定非空 */
+    SelectResult[SelectResult["R_C_Assert"] = 0] = "R_C_Assert";
+    /** 一行一列 可能空 */
+    SelectResult[SelectResult["R_C_NotSure"] = 1] = "R_C_NotSure";
+    /** 一行多列 确定非空 */
+    SelectResult[SelectResult["R_CS_Assert"] = 2] = "R_CS_Assert";
+    /** 一行多列 可能空 */
+    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 = {}));
 export var SqlType;
 (function (SqlType) {
@@ -187,8 +220,13 @@ export var SqlType;
     SqlType[SqlType["multipolygon"] = 32] = "multipolygon";
     SqlType[SqlType["geometrycollection"] = 33] = "geometrycollection";
 })(SqlType || (SqlType = {}));
+export var ColumnMode;
+(function (ColumnMode) {
+    ColumnMode[ColumnMode["NONE"] = 0] = "NONE";
+    ColumnMode[ColumnMode["HUMP"] = 1] = "HUMP";
+})(ColumnMode || (ColumnMode = {}));
 export const SqliteMemory = ':memory:';
-const _defOption = {
+export const _defOption = {
     maxDeal: 500,
     skipUndefined: true,
     skipNull: true,
@@ -381,7 +419,7 @@ class MysqlConnection {
     }
 }
 _a = _inTransaction;
-class Mysql {
+export class Mysql {
     constructor(pool) {
         this[_daoDB] = pool;
     }
@@ -394,7 +432,7 @@ class Mysql {
         return new Promise(async (resolve, reject) => {
             try {
                 const connection = await this[_daoDB].getConnection();
-                logger.debug('create new!');
+                logger.debug('create new connection!');
                 resolve(new MysqlConnection(connection));
             }
             catch (error) {
@@ -612,7 +650,7 @@ class SqliteConnection {
     }
 }
 _b = _inTransaction;
-class Sqlite {
+export class Sqlite {
     constructor(db) {
         this[_daoDB] = db;
         this[_daoDB].pragma('journal_mode = WAL');
@@ -674,7 +712,7 @@ class Sqlite {
     restore(sync, name) {
     }
 }
-class SqliteRemoteConnection {
+export class SqliteRemoteConnection {
     constructor(conn, name) {
         this[_c] = false;
         this[_daoConnection] = conn;
@@ -829,7 +867,7 @@ class SqliteRemoteConnection {
     }
 }
 _c = _inTransaction;
-class SqliteRemote {
+export class SqliteRemote {
     constructor(db, name) {
         this[_daoDB] = db;
         this[_sqliteRemoteName] = name;
@@ -840,8 +878,13 @@ class SqliteRemote {
             return null;
         }
         ;
-        return new Promise(async (resolve) => {
-            resolve(new SqliteRemoteConnection(this[_daoDB], this[_sqliteRemoteName]));
+        return new Promise(async (resolve, reject) => {
+            try {
+                resolve(new SqliteRemoteConnection(this[_daoDB], this[_sqliteRemoteName]));
+            }
+            catch (error) {
+                reject(error);
+            }
         });
     }
     transaction(sync, fn, conn) {
@@ -850,32 +893,52 @@ class SqliteRemote {
     }
     close(sync) {
         if (sync === SyncMode.Async) {
-            return new Promise(async () => {
-                await this[_daoConnection].close();
+            return new Promise(async (resolve, reject) => {
+                try {
+                    await this[_daoConnection].close();
+                }
+                catch (error) {
+                    reject(error);
+                }
             });
         }
         ;
     }
     backup(sync, name) {
         if (sync === SyncMode.Async) {
-            return new Promise(async () => {
-                await this[_daoConnection].backup(this[_sqliteRemoteName], name);
+            return new Promise(async (resolve, reject) => {
+                try {
+                    await this[_daoConnection].backup(this[_sqliteRemoteName], name);
+                }
+                catch (error) {
+                    reject(error);
+                }
             });
         }
         ;
     }
     remove(sync) {
         if (sync === SyncMode.Async) {
-            return new Promise(async () => {
-                await this[_daoConnection].remove();
+            return new Promise(async (resolve, reject) => {
+                try {
+                    await this[_daoConnection].remove();
+                }
+                catch (error) {
+                    reject(error);
+                }
             });
         }
         ;
     }
     restore(sync, name) {
         if (sync === SyncMode.Async) {
-            return new Promise(async () => {
-                await this[_daoConnection].restore(this[_sqliteRemoteName], name);
+            return new Promise(async (resolve, reject) => {
+                try {
+                    await this[_daoConnection].restore(this[_sqliteRemoteName], name);
+                }
+                catch (error) {
+                    reject(error);
+                }
             });
         }
         ;
@@ -900,7 +963,7 @@ class Build {
      * @returns
      * @memberof Build
      */
-    pageTag() {
+    page() {
         return (text, render) => {
             if (this.isCount === true) {
                 return Build.page;
@@ -912,11 +975,11 @@ class Build {
     }
     /**
    *
-   * 汇总查询专用
+   * 包含的内容只在汇总查询时有效，否则是空白
    * @returns
    * @memberof Build
    */
-    sumTag() {
+    sum() {
         return (text, render) => {
             if (this.isSum !== true) {
                 return '';
@@ -932,7 +995,7 @@ class Build {
      * @returns
      * @memberof Build
      */
-    pageIgnoreTag() {
+    notPage() {
         return (text, render) => {
             if (this.isCount === true || this.isSum === true) {
                 return '';
@@ -957,8 +1020,7 @@ class Build {
      */
     where() {
         return (text, render) => {
-            let data = render(text);
-            data = data.trim();
+            let data = render(text).trim();
             if (data) {
                 data = data.replace(/and|or/i, '');
                 return ` WHERE ${data} `;
@@ -968,6 +1030,33 @@ class Build {
             }
         };
     }
+    /**
+     * ```
+     * SELECT
+     * {{#hump}}
+     * a.event_id, a.event_name eventName
+     * {{/hump}}
+     * FROM...
+     * ```
+     * 编译后:
+     * ```
+     * SELECT
+     * a.event_id eventId, a.event_name eventName
+     * FROM...
+     * ```
+     */
+    hump() {
+        return (text, render) => {
+            let data = render(text).trim();
+            const datas = data.split(',');
+            for (let i = 0; i < datas.length; i++) {
+                if (datas[i]?.match(/\s|\t/) === null) {
+                    datas[i] = `${datas[i]} ${datas[i].replace(/[a-zA-Z0-9]+\./, '').replace(/_([a-z])/g, (a, b, c) => b.toUpperCase())}`;
+                }
+            }
+            return datas.join(',');
+        };
+    }
     /**
      * 删除第一个and、or
      * 删除最后一个,
@@ -991,13 +1080,13 @@ class Build {
      * 分页时将排序部分代码用此函数包起来，可以自动拼接order by
      * 查询条数时，自动忽略此部分
      * etc
-     * {{#orderTag}} name desc, age asc {{/orderTag}}
+     * {{#order}} name desc, age asc {{/order}}
      * ===
      * ORDER BY name desc, age asc
      * @returns
      * @memberof Build
      */
-    orderTag() {
+    order() {
         return (text, render) => {
             if (this.isCount === true || this.isSum === true) {
                 return '';
@@ -1013,7 +1102,7 @@ class Build {
             }
         };
     }
-    limitTag() {
+    limit() {
         return (text, render) => {
             if (this.isCount === true || this.isSum === true) {
                 return '';
@@ -1034,13 +1123,13 @@ class Build {
      * 分页时将分组部分代码用此函数包起来，可以自动拼接GROUP BY
      * 当分页时、汇总时，自动忽略此部分
      * etc
-     * {{#groupTag}} name, age {{/groupTag}}
+     * {{#between}} name, age {{/between}}
      * ===
      * group by name.age
      * @returns
      * @memberof Build
      */
-    groupTag() {
+    group() {
         return (text, render) => {
             if (this.isCount === true || this.isSum === true) {
                 return '';
@@ -1085,15 +1174,15 @@ class Build {
      *
      * 距离计算,单位米
      * etc
-     * {{#distanceTag}} (t.longitude, t.latitude), ({{longitude}}, {{latitude}}) {{/distanceTag}}
+     * {{#distance}} (t.longitude, t.latitude), ({{longitude}}, {{latitude}}) {{/distance}}
      * ===
      * ROUND(ST_DISTANCE(POINT(longitude1, latitude1), POINT({{longitude}}, {{latitude}}))*111195, 2)
      * 可根据需求自行将数据转换为千米，例如
-     * {{#distanceTag}} (t.longitude, t.latitude), ({{longitude}}, {{latitude}}) {{/distanceTag}} / 1000
+     * {{#distance}} (t.longitude, t.latitude), ({{longitude}}, {{latitude}}) {{/distance}} / 1000
      * @returns
      * @memberof Build
      */
-    distanceTag() {
+    distance() {
         return (text, render) => {
             const result = render(text);
             if (/\(([^()]+)\)/.exec(result)) {
@@ -1121,38 +1210,179 @@ class Build {
     }
 }
 Build.page = 'COUNT(1) zccw1986 ';
-class SqlCache {
+function replaceCdata(rawText) {
+    var cdataRegex = new RegExp('(<!\\[CDATA\\[)([\\s\\S]*?)(\\]\\]>)', 'g');
+    var matches = rawText.match(cdataRegex);
+    if (matches != null && matches.length > 0) {
+        for (var z = 0; z < matches.length; z++) {
+            var regex = new RegExp('(<!\\[CDATA\\[)([\\s\\S]*?)(\\]\\]>)', 'g');
+            var m = regex.exec(matches[z]);
+            var cdataText = m[2];
+            cdataText = cdataText.replace(/\&/g, '&amp;');
+            cdataText = cdataText.replace(/\</g, '&lt;');
+            cdataText = cdataText.replace(/\>/g, '&gt;');
+            cdataText = cdataText.replace(/\"/g, '&quot;');
+            rawText = rawText.replace(m[0], cdataText);
+        }
+    }
+    return rawText;
+}
+function _flatData(result, i, length, keys, V) {
+    var _d;
+    const key = keys[i];
+    if (i < length) {
+        result[_d = key] ?? (result[_d] = {});
+        i++;
+        _flatData(result[key], i, length, keys, V);
+    }
+    else {
+        result[key] = V;
+    }
+}
+/**
+ * ifUndefined默认是MapperIfUndefined.Skip
+ */
+export function flatData(options) {
+    if (typeof options.mapper === 'string') {
+        const name = options.mapper;
+        options.mapper = globalThis[_resultMap][name];
+        Throw.if(!options.mapper, `not found mapper!${name}`);
+    }
+    options.mapperIfUndefined ?? (options.mapperIfUndefined = MapperIfUndefined.Skip);
+    options.mapper = options.mapper;
+    const result = {};
+    for (const [columnName, keys, def] of options.mapper) {
+        let V = options.data[columnName];
+        if (V === undefined) {
+            if (options.mapperIfUndefined === MapperIfUndefined.Null) {
+                V = null;
+            }
+            else if (options.mapperIfUndefined === MapperIfUndefined.Zero) {
+                V = 0;
+            }
+            else if (options.mapperIfUndefined === MapperIfUndefined.EmptyString) {
+                V = '';
+            }
+            else if (def !== undefined) {
+                V = def;
+            }
+            else {
+                continue;
+            }
+        }
+        _flatData(result, 0, keys.length - 1, keys, V);
+    }
+    return result;
+}
+export class SqlCache {
     constructor() {
         this.sqlMap = {};
         this.sqlFNMap = {};
     }
-    async init(options) {
-        if (options.sqlMap) {
-            this.sqlMap = options.sqlMap;
-        }
-        if (options.sqlDir) {
-            const sqlFis = globalThis[_fs].readdirSync(options.sqlDir);
-            for (const modeName of sqlFis) {
+    async _read(jsMode, sqlDir, queryTypes, rootName) {
+        const sqlFis = globalThis[_fs].readdirSync(sqlDir);
+        for (const modeName of sqlFis) {
+            const file = globalThis[_path].join(sqlDir, modeName);
+            const stat = globalThis[_fs].statSync(file);
+            if (stat.isDirectory()) {
+                await this._read(jsMode, file, queryTypes, modeName);
+            }
+            else {
                 const extname = globalThis[_path].extname(modeName);
                 const name = globalThis[_path].basename(modeName, extname);
-                const file = globalThis[_path].join(options.sqlDir, modeName);
-                if (extname === 'mu') {
-                    const parser = new MUParser(name, globalThis[_fs].readFileSync(file, { encoding: 'utf-8' }).toString());
+                let ct = 0;
+                if (extname === '.mu') {
+                    logger.debug(`sql: ${file} start explain!`);
+                    const parser = new MUParser(rootName || name, globalThis[_fs].readFileSync(file, { encoding: 'utf-8' }).toString());
                     let source = parser.next();
                     while (source != null) {
+                        ct++;
                         this.sqlMap[source[0]] = source[1];
                         logger.debug(`sql: ${source[0]} found!`);
                         source = parser.next();
                     }
+                    logger.debug(`sql: ${file} explain over[${ct}]!`);
                 }
-                else if (extname === '.js') {
-                    const obj = (await import(globalThis[_path].join(options.sqlDir, modeName))).default;
+                else if (jsMode === true && extname === '.js') {
+                    logger.debug(`sql: ${file} start explain!`);
+                    const obj = (await import(globalThis[_path].join(sqlDir, modeName))).default;
                     for (const [key, fn] of Object.entries(obj)) {
-                        this.sqlMap[`${name}.${String(key)}`] = fn;
+                        ct++;
+                        this.sqlMap[`${rootName || name}.${String(key)}`] = fn;
                     }
+                    logger.debug(`sql: ${file} explain over[${ct}]!`);
+                }
+                else if (extname === '.xml') {
+                    logger.debug(`sql: ${file} start explain!`);
+                    const root = HTML.parse(replaceCdata(globalThis[_fs].readFileSync(file, { encoding: 'utf-8' }).toString()))[0];
+                    if (root) {
+                        const mappers = root.children;
+                        for (const mapper of mappers) {
+                            if (mapper.type === 'tag' && mapper.name === 'mapper') {
+                                for (const am of mapper.children) {
+                                    if (am.type === 'tag') {
+                                        Throw.if(!queryTypes.includes(am.name), `${rootName} ${name}错误,${am.name}不支持!`);
+                                        am.id = am.attrs['id'];
+                                        Throw.if(!am.id, `${rootName} ${name}错误,没有为此块设置id:${am}`);
+                                        if (am.name === 'resultMap') {
+                                            ct++;
+                                            globalThis[_resultMap] ?? (globalThis[_resultMap] = {});
+                                            const keys = [];
+                                            this.readResultMap(am.children, keys, []);
+                                            globalThis[_resultMap][am.id] = keys;
+                                            logger.debug(`sql_resultMap: ${am.id} found!`);
+                                        }
+                                        else {
+                                            this.sqlMap[`${rootName || name}.${am.id}`] = am.children;
+                                            if (am.attrs['resultMap']) {
+                                                globalThis[_resultMap_SQLID][`${rootName || name}.${am.id}`] = am.attrs['resultMap'];
+                                                logger.debug(`sql: autoMapper: ${rootName || name}.${am.id}-${am.attrs['resultMap']}`);
+                                            }
+                                            logger.debug(`sql: ${rootName || name}.${am.id} found!`);
+                                            ct++;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    logger.debug(`sql: ${file} explain over[${ct}]!`);
+                }
+            }
+        }
+    }
+    /**
+     *
+     * ```
+    // 第一个元素=列名，第二个元素是属性路径，
+    [
+        ['dit_id', ['id']], // 列名ditid,对应属性id
+        ['event_id', ['eventMainInfo', 'id']] // 列名event_id对应属性eventMainInfo.id
+    ]
+     * ```
+     * @param am
+     * @param keys
+     */
+    readResultMap(ams, keys, key) {
+        for (const am of ams) {
+            if (am.type === 'tag') {
+                if (am.name === 'result' || am.name === 'id') {
+                    keys.push([am.attrs['column'], [...key, am.attrs['property']]]);
+                }
+                else {
+                    this.readResultMap(am.children, keys, [...key, am.attrs['property']]);
                 }
             }
         }
+    }
+    async init(options) {
+        if (options.sqlMap) {
+            this.sqlMap = options.sqlMap;
+        }
+        const queryTypes = ['sql', 'select', 'insert', 'update', 'delete', 'resultMap'];
+        if (options.sqlDir) {
+            await this._read(options.jsMode === true, options.sqlDir, queryTypes, '');
+        }
         if (options.sqlFNMap) {
             this.sqlFNMap = options.sqlFNMap;
         }
@@ -1167,15 +1397,50 @@ class SqlCache {
                 }
             }
         }
+        if (options.sqlMapperMap) {
+            globalThis[_resultMap] = options.sqlFNMap;
+        }
+        if (options.sqlMapperDir) {
+            const sqlFis = globalThis[_fs].readdirSync(options.sqlDir);
+            globalThis[_resultMap] ?? (globalThis[_resultMap] = {});
+            for (const modeName of sqlFis) {
+                const extname = globalThis[_path].extname(modeName);
+                const name = globalThis[_path].basename(modeName, extname);
+                const file = globalThis[_path].join(options.sqlDir, modeName);
+                if (extname === 'json') {
+                    globalThis[_resultMap][name] = JSON.parse(globalThis[_fs].readFileSync(file, { encoding: 'utf-8' }).toString());
+                }
+            }
+        }
     }
-    load(sqlid, options) {
-        const sqlSource = this.sqlMap[sqlid];
-        Throw.if(!sqlSource, `指定的语句${sqlid}不存在!`);
-        const _sql = typeof sqlSource === 'function' ? sqlSource(options) : sqlSource;
+    load(sqlids, options) {
+        let sqlSource;
+        for (const sqlid of sqlids) {
+            sqlSource = this.sqlMap[sqlid];
+            if (sqlSource) {
+                break;
+            }
+        }
+        const matchSqlid = sqlids.map(i => i.split('.')[0]);
+        Throw.if(!sqlSource, `指定的语句${sqlids.join('|')}不存在!`);
         const buildParam = new Build(options.isCount === true, options.isSum === true, options);
-        const sql = mustache.render(_sql, buildParam, this.sqlFNMap);
-        logger.debug(sqlid, sql);
-        return sql;
+        if (typeof sqlSource === 'function') {
+            const _sql = sqlSource(options);
+            const sql = mustache.render(_sql, buildParam, this.sqlFNMap);
+            return format(sql);
+        }
+        else if (typeof sqlSource === 'string') {
+            const sql = mustache.render(sqlSource, buildParam, this.sqlFNMap);
+            return format(sql);
+        }
+        else if (typeof sqlSource === 'object') {
+            const _sql = convert(sqlSource, options, matchSqlid, this.sqlMap);
+            console.log(_sql);
+            const sql = mustache.render(_sql, buildParam, this.sqlFNMap);
+            console.log(sql);
+            return format(sql);
+        }
+        return '';
     }
 }
 // #endregion
@@ -1204,6 +1469,8 @@ function P(skipConn = false) {
             const option = args[0] = Object.assign({}, globalThis[_GlobalSqlOption], this[_SqlOption], args[0]);
             option.sync ?? (option.sync = SyncMode.Async);
             const dbName = option?.dbName ?? this[_daoDBName] ?? _primaryDB;
+            const dddx = this[_dbType];
+            logger.info(dddx);
             option.dao = globalThis[_dao][this[_dbType]][dbName];
             Throw.if(!option.dao, `not found db:${String(dbName)}(${this[_dbType]})`);
             option.tableName = option?.tableName ?? this[_tableName];
@@ -1227,7 +1494,7 @@ function P(skipConn = false) {
                         if (tableVersion && tableVersion < lastVersion) { // 发现需要升级的版本
                             // 更新版本
                             const columns = iterare(option.conn.query(SyncMode.Sync, `PRAGMA table_info(${tableES})`))
-                                .filter(c => this[_fields].hasOwnProperty(c.name))
+                                .filter(c => this[_fields].hasOwnProperty(C2P(c.name, globalThis[_Hump])))
                                 .map(c => Sqlstring.escapeId(c.name))
                                 .join(',');
                             const rtable = Sqlstring.escapeId(`${option.tableName}_${tableVersion.replace(/\./, '_')}`);
@@ -1235,13 +1502,13 @@ function P(skipConn = false) {
                             option.conn.execute(SyncMode.Sync, `ALTER TABLE ${tableES} RENAME TO ${rtable};`);
                             option.conn.execute(SyncMode.Sync, `
                                 CREATE TABLE IF NOT EXISTS ${tableES}(
-                                    ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]).join(',')}
-                                    ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.esName).join(',')})` : ''}
+                                    ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]()).join(',')}
+                                    ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.C2()).join(',')})` : ''}
                                 );
                             `);
                             if (this[_index] && this[_index].length) {
                                 for (const index of this[_index]) {
-                                    option.conn.execute(SyncMode.Sync, `CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${tableES} ("${index}");`);
+                                    option.conn.execute(SyncMode.Sync, `CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${tableES} ("${this[_fields][index]?.C2()}");`);
                                 }
                             }
                             option.conn.execute(SyncMode.Sync, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
@@ -1258,14 +1525,14 @@ function P(skipConn = false) {
                         // 创建表
                         option.conn.execute(SyncMode.Sync, `
                             CREATE TABLE IF NOT EXISTS ${tableES} (
-                                ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]).join(',')}
-                                ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.esName).join(',')})` : ''}
+                                ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]()).join(',')}
+                                ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.C2()).join(',')})` : ''}
                     
                             );
                         `);
                         if (this[_index] && this[_index].length) {
                             for (const index of this[_index]) {
-                                option.conn.execute(SyncMode.Sync, `CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${tableES} ("${index}");`);
+                                option.conn.execute(SyncMode.Sync, `CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${tableES} ("${this[_fields][index]?.C2()}");`);
                             }
                         }
                         option.conn.execute(SyncMode.Sync, 'INSERT OR REPLACE INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option.tableName, lastVersion]);
@@ -1314,7 +1581,7 @@ function P(skipConn = false) {
                             if (tableVersion && tableVersion < lastVersion) { // 发现需要升级的版本
                                 // 更新版本
                                 const columns = iterare(await option.conn.query(SyncMode.Async, `PRAGMA table_info(${tableES})`))
-                                    .filter(c => this[_fields].hasOwnProperty(c.name))
+                                    .filter(c => this[_fields].hasOwnProperty(C2P(c.name, globalThis[_Hump])))
                                     .map(c => Sqlstring.escapeId(c.name))
                                     .join(',');
                                 const rtable = `${option.tableName}_${tableVersion.replace(/\./, '_')}`;
@@ -1322,13 +1589,13 @@ function P(skipConn = false) {
                                 await option.conn.execute(SyncMode.Async, `ALTER TABLE ${tableES} RENAME TO ${rtable};`);
                                 await option.conn.execute(SyncMode.Async, `
                                 CREATE TABLE IF NOT EXISTS ${tableES}(
-                                    ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]).join(',')}
-                                    ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.esName).join(',')})` : ''}
+                                    ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]()).join(',')}
+                                    ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.C2()).join(',')})` : ''}
                                 );
                             `);
                                 if (this[_index] && this[_index].length) {
                                     for (const index of this[_index]) {
-                                        await option.conn.execute(SyncMode.Async, `CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${tableES} ("${index}");`);
+                                        await option.conn.execute(SyncMode.Async, `CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${tableES} ("${this[_fields][index]?.C2()}");`);
                                     }
                                 }
                                 await option.conn.execute(SyncMode.Async, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
@@ -1345,13 +1612,13 @@ function P(skipConn = false) {
                             // 创建表
                             await option.conn.execute(SyncMode.Async, `
                             CREATE TABLE IF NOT EXISTS ${tableES}(
-                                ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]).join(',')}
-                                ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.esName).join(',')})` : ''}
+                                ${Object.values(this[_fields]).map(K => K[DBType.Sqlite]()).join(',')}
+                                ${this[_ids] && this[_ids].length ? `, PRIMARY KEY (${this[_ids].map(i => this[_fields][i]?.C2()).join(',')})` : ''}
                             );
                         `);
                             if (this[_index] && this[_index].length) {
                                 for (const index of this[_index]) {
-                                    await option.conn.execute(SyncMode.Async, `CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${Sqlstring.escapeId(option.tableName)} ("${index}");`);
+                                    await option.conn.execute(SyncMode.Async, `CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${Sqlstring.escapeId(option.tableName)} ("${this[_fields][index]?.C2()}");`);
                                 }
                             }
                             await option.conn.execute(SyncMode.Async, 'INSERT OR REPLACE INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option.tableName, lastVersion]);
@@ -1409,28 +1676,44 @@ function P(skipConn = false) {
         };
     };
 }
-const FieldFilter = (K, V, def, option) => {
+const FieldFilter = (K, V, def, uuidColumn, option) => {
     let ret = 0;
-    if (V === null) {
-        if (option?.skipNull !== true) {
-            ret = 1;
-            V = option?.def === true && def && def.hasOwnProperty(K) ? def[K] : null;
+    // 如果是插入操作且字段是UUID，则不进行空值检查
+    // 只有在非插入或者非UUID时，进行空置检查
+    if (option?.insert === true && uuidColumn === true) {
+        ret = 1;
+        if (V === undefined) {
+            V = null;
         }
-    }
-    else if (V === undefined) {
-        if (option?.skipUndefined !== true) {
-            ret = 1;
-            V = option?.def === true && def && def.hasOwnProperty(K) ? def[K] : null;
+        else if (emptyString(`${V ?? ''}`)) {
+            V = '';
         }
-    }
-    else if (emptyString(`${V ?? ''}`)) {
-        if (option?.skipEmptyString !== true) {
+        else {
             ret = 1;
-            V = option?.def === true && def && def.hasOwnProperty(K) ? def[K] : '';
         }
     }
     else {
-        ret = 1;
+        if (V === null) {
+            if (option?.skipNull !== true) {
+                ret = 1;
+                V = option?.insert === true && def && def.hasOwnProperty(K) ? def[K] : null;
+            }
+        }
+        else if (V === undefined) {
+            if (option?.skipUndefined !== true) {
+                ret = 1;
+                V = option?.insert === true && def && def.hasOwnProperty(K) ? def[K] : null;
+            }
+        }
+        else if (emptyString(`${V ?? ''}`)) {
+            if (option?.skipEmptyString !== true) {
+                ret = 1;
+                V = option?.insert === true && def && def.hasOwnProperty(K) ? def[K] : '';
+            }
+        }
+        else {
+            ret = 1;
+        }
     }
     if (ret === 1) {
         option?.finalColumns?.add(K);
@@ -1443,193 +1726,195 @@ export const Field = (config) => {
     config.type ?? (config.type = SqlType.varchar);
     return (object, propertyName) => {
         const field = config;
-        field.name = propertyName;
-        field.esName = Sqlstring.escapeId(propertyName);
+        field.P = propertyName;
+        field.C = () => P2C(propertyName, globalThis[_Hump]);
+        field.C2 = () => Sqlstring.escapeId(P2C(propertyName, globalThis[_Hump]));
+        field.C3 = () => `${Sqlstring.escapeId(P2C(propertyName, globalThis[_Hump]))} ${propertyName}`;
         const hasDef = field.hasOwnProperty('def') === true;
         switch (field.type) {
             case SqlType.tinyint: {
-                field[DBType.Mysql] = `${field.esName} tinyint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} integer`;
+                field[DBType.Mysql] = () => `${field.C2()} tinyint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} integer`;
                 break;
             }
             case SqlType.smallint: {
-                field[DBType.Mysql] = `${field.esName} smallint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} integer`;
+                field[DBType.Mysql] = () => `${field.C2()} smallint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} integer`;
                 break;
             }
             case SqlType.mediumint: {
-                field[DBType.Mysql] = `${field.esName} smallint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} integer`;
+                field[DBType.Mysql] = () => `${field.C2()} smallint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} integer`;
                 break;
             }
             case SqlType.int: {
-                field[DBType.Mysql] = `${field.esName} int ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} integer`;
+                field[DBType.Mysql] = () => `${field.C2()} int ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} integer`;
                 break;
             }
             case SqlType.bigint: {
-                field[DBType.Mysql] = `${field.esName} bigint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} integer`;
+                field[DBType.Mysql] = () => `${field.C2()} bigint ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} integer`;
                 break;
             }
             case SqlType.float: {
-                field[DBType.Mysql] = `${field.esName} float(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} `;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} real`;
+                field[DBType.Mysql] = () => `${field.C2()} float(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''} `;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} real`;
                 break;
             }
             case SqlType.double: {
-                field[DBType.Mysql] = `${field.esName} double(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} `;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} real`;
+                field[DBType.Mysql] = () => `${field.C2()} double(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''} `;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} real`;
                 break;
             }
             case SqlType.decimal: {
-                field[DBType.Mysql] = `${field.esName} decimal(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} `;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} real`;
+                field[DBType.Mysql] = () => `${field.C2()} decimal(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''} `;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} real`;
                 break;
             }
             case SqlType.longtext: {
-                field[DBType.Mysql] = `${field.esName} longtext ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} longtext ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.mediumtext: {
-                field[DBType.Mysql] = `${field.esName} mediumtext ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} mediumtext ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.text: {
-                field[DBType.Mysql] = `${field.esName} text ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.date: {
-                field[DBType.Mysql] = `${field.esName} date ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} date ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.time: {
-                field[DBType.Mysql] = `${field.esName} time ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} time ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.year: {
-                field[DBType.Mysql] = `${field.esName} year ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} year ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.datetime: {
-                field[DBType.Mysql] = `${field.esName} datetime ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} datetime ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.timestamp: {
-                field[DBType.Mysql] = `${field.esName} timestamp ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} integer`;
+                field[DBType.Mysql] = () => `${field.C2()} timestamp ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} integer`;
                 break;
             }
             case SqlType.char: {
-                field[DBType.Mysql] = `${field.esName} char(${config.length ?? 1}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} char(${config.length ?? 1}) ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.varchar: {
-                field[DBType.Mysql] = `${field.esName} varchar(${config.length ?? 1}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} varchar(${config.length ?? 1}) ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.tinyblob: {
-                field[DBType.Mysql] = `${field.esName} tinyblob ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} tinyblob ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.tinytext: {
-                field[DBType.Mysql] = `${field.esName} tinytext ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} tinytext ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.blob: {
-                field[DBType.Mysql] = `${field.esName} binary ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} binary ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.text: {
-                field[DBType.Mysql] = `${field.esName} text ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.mediumblob: {
-                field[DBType.Mysql] = `${field.esName} mediumblob ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} mediumblob ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.mediumtext: {
-                field[DBType.Mysql] = `${field.esName} mediumtext ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} mediumtext ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.longblob: {
-                field[DBType.Mysql] = `${field.esName} longblob ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} longblob ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.longtext: {
-                field[DBType.Mysql] = `${field.esName} longtext ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} longtext ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.set: {
-                field[DBType.Mysql] = `${field.esName} set ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} set ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.enum: {
-                field[DBType.Mysql] = `${field.esName} enum ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} enum ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.json: {
-                field[DBType.Mysql] = `${field.esName} json ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} json ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.geometry: {
-                field[DBType.Mysql] = `${field.esName} geometry ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} geometry ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.point: {
-                field[DBType.Mysql] = `${field.esName} point ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} point ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.linestring: {
-                field[DBType.Mysql] = `${field.esName} linestring ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} linestring ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.polygon: {
-                field[DBType.Mysql] = `${field.esName} polygon ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} polygon ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.multipoint: {
-                field[DBType.Mysql] = `${field.esName} multipoint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} multipoint ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.multilinestring: {
-                field[DBType.Mysql] = `${field.esName} multilinestring ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} multilinestring ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.multipolygon: {
-                field[DBType.Mysql] = `${field.esName} multipolygon ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} multipolygon ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.geometrycollection: {
-                field[DBType.Mysql] = `${field.esName} geometrycollection ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? field.def : ''} ${MYSQLCHARSET}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = `${field.esName} text`;
+                field[DBType.Mysql] = () => `${field.C2()} geometrycollection ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
         }
@@ -1676,7 +1961,7 @@ export const Field = (config) => {
 };
 export const DB = (config) => {
     return function (constructor) {
-        var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+        var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
         const __ids = Reflect.getMetadata(_ids, config.clz.prototype) || new Array;
         const __fields = Reflect.getMetadata(_fields, config.clz.prototype);
         const __columns = Reflect.getMetadata(_columns, config.clz.prototype);
@@ -1685,25 +1970,31 @@ export const DB = (config) => {
         const __deleteState = Reflect.getMetadata(_deleteState, config.clz.prototype);
         const __index = Reflect.getMetadata(_index, config.clz.prototype);
         const __def = Reflect.getMetadata(_def, config.clz.prototype);
-        return _t = class extends constructor {
+        const className = config.tableName?.replace(/_(\w)/g, (a, b) => b.toUpperCase());
+        const ClassName = className?.replace(/\w/, (v) => v.toUpperCase());
+        const vueName = config.tableName?.replace(/_/g, '-');
+        return _w = class extends constructor {
                 constructor() {
                     super(...arguments);
                     this[_d] = config.tableName;
-                    this[_e] = config.dbName;
-                    this[_f] = config.dbType ?? DBType.Mysql;
-                    this[_g] = config.sqliteVersion;
-                    this[_h] = Object.assign({}, _defOption, config);
-                    this[_j] = __ids;
-                    this[_k] = __fields;
-                    this[_l] = __columns;
-                    this[_m] = __columnsNoId;
-                    this[_o] = __index;
-                    this[_p] = __def;
-                    this[_q] = __stateFileName;
-                    this[_r] = __deleteState;
-                    this[_s] = (data, option) => {
+                    this[_e] = className;
+                    this[_f] = ClassName;
+                    this[_g] = vueName;
+                    this[_h] = config.dbName;
+                    this[_j] = config.dbType ?? DBType.Mysql;
+                    this[_k] = config.sqliteVersion;
+                    this[_l] = Object.assign({}, _defOption, config);
+                    this[_m] = __ids;
+                    this[_o] = __fields;
+                    this[_p] = __columns;
+                    this[_q] = __columnsNoId;
+                    this[_r] = __index;
+                    this[_s] = __def;
+                    this[_t] = __stateFileName;
+                    this[_u] = __deleteState;
+                    this[_v] = (data, option) => {
                         return Object.fromEntries(iterare(option?.skipId === true ? __columnsNoId : __columns)
-                            .map(K => [K, FieldFilter(K, data[K], __def, option)])
+                            .map(K => [K, FieldFilter(K, data[K], __def, __fields[K].uuid === true || __fields[K].uuidShort === true, option)])
                             .filter(data => {
                             if (data[1][0] === 1) {
                                 if (option?.onFieldExists) {
@@ -1721,20 +2012,23 @@ export const DB = (config) => {
                 }
             },
             _d = _tableName,
-            _e = _daoDBName,
-            _f = _dbType,
-            _g = _sqlite_version,
-            _h = _SqlOption,
-            _j = _ids,
-            _k = _fields,
-            _l = _columns,
-            _m = _columnsNoId,
-            _o = _index,
-            _p = _def,
-            _q = _stateFileName,
-            _r = _deleteState,
-            _s = _transformer,
-            _t;
+            _e = _className,
+            _f = _ClassName,
+            _g = _vueName,
+            _h = _daoDBName,
+            _j = _dbType,
+            _k = _sqlite_version,
+            _l = _SqlOption,
+            _m = _ids,
+            _o = _fields,
+            _p = _columns,
+            _q = _columnsNoId,
+            _r = _index,
+            _s = _def,
+            _t = _stateFileName,
+            _u = _deleteState,
+            _v = _transformer,
+            _w;
     };
 };
 /**
@@ -1751,7 +2045,7 @@ export const DB = (config) => {
  */
 export function DeclareClass(clz, FieldOptions) {
     for (const item of FieldOptions) {
-        tslib.__decorate([Field(item)], clz.prototype, item.name, void 0);
+        tslib.__decorate([Field(item)], clz.prototype, item.P, void 0);
     }
 }
 /**
@@ -1788,135 +2082,194 @@ export class SqlService {
                 const conditions = option.existConditionOtherThanIds || this[_ids];
                 Throw.if(!conditions, 'not found where condition for insertIfNotExists!');
                 Throw.if(conditions.length === 0, 'insertIfNotExists must have not null where!');
-                const where = iterare(conditions).map(c => `${this[_fields][c]?.esName} = ?`).join(' AND ');
+                const where = iterare(conditions).map(c => `${this[_fields][c]?.C2()} = ?`).join(' AND ');
                 const finalColumns = new Set();
                 const whereColumns = conditions;
-                const params = datas
-                    .map(data => this[_transformer](data, { ...option, finalColumns, def: true }))
-                    .flatMap(data => {
-                    const result = [];
+                const params = [];
+                const questMarks = datas
+                    .map(data => this[_transformer](data, { ...option, finalColumns, insert: true }))
+                    .map(data => {
                     const questMark = new Array();
                     for (const column of finalColumns) {
-                        questMark.push('?');
-                        result.push(data.hasOwnProperty(column)
+                        const V = data.hasOwnProperty(column)
                             ? data[column]
                             : this[_def] && this[_def].hasOwnProperty(column)
                                 ? this[_def][column]
-                                : null);
+                                : null;
+                        if (V === null) {
+                            const field = this[_fields][column];
+                            if (field?.uuid) {
+                                questMark.push('UUID()');
+                            }
+                            else if (field?.uuidShort && this[_dbType] === DBType.Mysql) {
+                                questMark.push('UUID_SHORT()');
+                            }
+                            else {
+                                questMark.push('?');
+                                params.push(V);
+                            }
+                        }
+                        else {
+                            questMark.push('?');
+                            params.push(V);
+                        }
                     }
                     for (const column of whereColumns) {
-                        questMark.push('?');
-                        result.push(data.hasOwnProperty(column)
+                        params.push(data.hasOwnProperty(column)
                             ? data[column]
                             : this[_def] && this[_def].hasOwnProperty(column)
                                 ? this[_def][column]
                                 : null);
                     }
-                    return result;
+                    return `SELECT ${questMark.join(',')} FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM ${tableName} WHERE ${where})`;
                 });
-                const quests = new Array(finalColumns.size).fill('?').join(',');
-                const columnNames = iterare(finalColumns).map(i => this[_fields][i]?.esName).join(',');
-                const selects = iterare(new Array(datas.length)).map(() => `SELECT ${quests} FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM ${tableName} WHERE ${where})`).join(' UNION ALL ');
-                const sql = `INSERT INTO
-                        ${tableName}
-                        (${columnNames})
-                        ${selects};`;
+                const columnNames = iterare(finalColumns).map(i => this[_fields][i]?.C2()).join(',');
+                const sql = format(`INSERT INTO
+                ${tableName}
+                (${columnNames})
+                ${questMarks.join(' UNION ALL ')};`);
                 sqls.push({ sql, params });
+                break;
             }
             case InsertMode.Replace: {
                 const finalColumns = new Set();
-                const params = datas
-                    .map(data => this[_transformer](data, { ...option, finalColumns, def: true }))
-                    .flatMap(data => {
-                    const result = [];
+                const params = [];
+                const questMarks = datas
+                    .map(data => this[_transformer](data, { ...option, finalColumns, insert: true }))
+                    .map(data => {
                     const questMark = new Array();
                     for (const column of finalColumns) {
-                        questMark.push('?');
-                        result.push(data.hasOwnProperty(column)
+                        const V = data.hasOwnProperty(column)
                             ? data[column]
                             : this[_def] && this[_def].hasOwnProperty(column)
                                 ? this[_def][column]
-                                : null);
+                                : null;
+                        if (V === null) {
+                            const field = this[_fields][column];
+                            if (field?.uuid) {
+                                questMark.push('UUID()');
+                            }
+                            else if (field?.uuidShort && this[_dbType] === DBType.Mysql) {
+                                questMark.push('UUID_SHORT()');
+                            }
+                            else {
+                                questMark.push('?');
+                                params.push(V);
+                            }
+                        }
+                        else {
+                            questMark.push('?');
+                            params.push(V);
+                        }
                     }
-                    return result;
+                    return `(${questMark.join(',')})`;
                 });
-                const quests = new Array(finalColumns.size).fill('?').join(',');
-                const columnNames = iterare(finalColumns).map(i => this[_fields][i]?.esName).join(',');
-                const questMarks = iterare(new Array(datas.length)).map(() => `(${quests})`).join(',');
-                const sql = `
+                const columnNames = iterare(finalColumns).map(i => this[_fields][i]?.C2()).join(',');
+                const sql = format(`
                     ${this[_dbType] === DBType.Mysql ? '' : 'INSERT OR'} REPLACE INTO
                     ${tableName}
                     (${columnNames})
                     VALUES ${questMarks};
-                `;
+                `);
                 sqls.push({ sql, params });
+                break;
             }
             case InsertMode.Insert: {
                 const finalColumns = new Set();
-                const params = datas
-                    .map(data => this[_transformer](data, { ...option, finalColumns, def: true }))
-                    .flatMap(data => {
-                    const result = [];
+                const params = [];
+                const questMarks = datas
+                    .map(data => this[_transformer](data, { ...option, finalColumns, insert: true }))
+                    .map(data => {
                     const questMark = new Array();
                     for (const column of finalColumns) {
-                        questMark.push('?');
-                        result.push(data.hasOwnProperty(column)
+                        const V = data.hasOwnProperty(column)
                             ? data[column]
                             : this[_def] && this[_def].hasOwnProperty(column)
                                 ? this[_def][column]
-                                : null);
+                                : null;
+                        if (V === null) {
+                            const field = this[_fields][column];
+                            if (field?.uuid) {
+                                questMark.push('UUID()');
+                            }
+                            else if (field?.uuidShort && this[_dbType] === DBType.Mysql) {
+                                questMark.push('UUID_SHORT()');
+                            }
+                            else {
+                                questMark.push('?');
+                                params.push(V);
+                            }
+                        }
+                        else {
+                            questMark.push('?');
+                            params.push(V);
+                        }
                     }
-                    return result;
+                    return `(${questMark.join(',')})`;
                 });
-                const quests = new Array(finalColumns.size).fill('?').join(',');
-                const columnNames = iterare(finalColumns).map(i => this[_fields][i]?.esName).join(',');
-                const questMarks = iterare(new Array(datas.length)).map(() => `(${quests})`).join(',');
-                const sql = `
+                const columnNames = iterare(finalColumns).map(i => this[_fields][i]?.C2()).join(',');
+                const sql = format(`
                     INSERT INTO
                     ${tableName}
                     (${columnNames})
                     VALUES ${questMarks};
-                `;
+                `);
                 sqls.push({ sql, params });
+                break;
             }
             case InsertMode.InsertWithTempTable: {
                 const tableTemp = `${option?.tableName}_${Math.random()}`.replace(/\./, '');
                 const tableTempESC = Sqlstring.escapeId(tableTemp);
                 sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
                 const finalColumns = new Set();
-                const params = datas
-                    .map(data => this[_transformer](data, { ...option, finalColumns, def: true }))
-                    .flatMap(data => {
-                    const result = [];
+                const params = [];
+                const questMarks = datas
+                    .map(data => this[_transformer](data, { ...option, finalColumns, insert: true }))
+                    .map(data => {
                     const questMark = new Array();
                     for (const column of finalColumns) {
-                        questMark.push('?');
-                        result.push(data.hasOwnProperty(column)
+                        const V = data.hasOwnProperty(column)
                             ? data[column]
                             : this[_def] && this[_def].hasOwnProperty(column)
                                 ? this[_def][column]
-                                : null);
+                                : null;
+                        if (V === null) {
+                            const field = this[_fields][column];
+                            if (field?.uuid) {
+                                questMark.push('UUID()');
+                            }
+                            else if (field?.uuidShort && this[_dbType] === DBType.Mysql) {
+                                questMark.push('UUID_SHORT()');
+                            }
+                            else {
+                                questMark.push('?');
+                                params.push(V);
+                            }
+                        }
+                        else {
+                            questMark.push('?');
+                            params.push(V);
+                        }
                     }
-                    return result;
+                    return `(${questMark.join(',')})`;
                 });
                 const _sqls = this._createTable({ tableName: tableTemp, temp: true, columns: Array.from(finalColumns) });
                 sqls.push(..._sqls);
-                const quests = new Array(finalColumns.size).fill('?').join(',');
-                const columnNames = iterare(finalColumns).map(i => this[_fields][i]?.esName).join(',');
-                const questMarks = iterare(new Array(datas.length)).map(() => `(${quests})`).join(',');
+                const columnNames = iterare(finalColumns).map(i => this[_fields][i]?.C2()).join(',');
                 sqls.push({
-                    sql: `
+                    sql: format(`
                         INSERT INTO
                         ${tableTemp}
                         (${columnNames})
                         VALUES ${questMarks};
-                    `, params
+                    `), params
                 });
                 sqls.push({
-                    sql: `INSERT INTO ${Sqlstring.escapeId(option.tableName)} (${columnNames})
-                        SELECT ${columnNames} FROM ${tableTemp};`
+                    sql: format(`INSERT INTO ${Sqlstring.escapeId(option.tableName)} (${columnNames})
+                        SELECT ${columnNames} FROM ${tableTemp};`)
                 });
                 sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
+                break;
             }
         }
         return sqls;
@@ -1943,7 +2296,7 @@ export class SqlService {
                 else
                     return result[0];
             };
-            if (option?.conn?.[_inTransaction] === true) {
+            if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
                 return fn();
             }
             else {
@@ -1967,12 +2320,17 @@ export class SqlService {
                     return result;
                 }, option?.conn);
             };
-            return new Promise(async (resolve) => {
-                if (option?.conn?.[_inTransaction] === true) {
-                    resolve((await fn()));
+            return new Promise(async (resolve, reject) => {
+                try {
+                    if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+                        resolve((await fn()));
+                    }
+                    else {
+                        await option?.dao?.transaction(SyncMode.Async, async () => resolve((await fn())), option?.conn);
+                    }
                 }
-                else {
-                    await option?.dao?.transaction(SyncMode.Async, async () => resolve((await fn())), option?.conn);
+                catch (error) {
+                    reject(error);
                 }
             });
         }
@@ -1991,12 +2349,17 @@ export class SqlService {
                 }, { everyLength: 1 });
                 return result[0];
             };
-            return new Promise(async (resolve) => {
-                if (option?.conn?.[_inTransaction] === true) {
-                    resolve((await fn()));
+            return new Promise(async (resolve, reject) => {
+                try {
+                    if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+                        resolve((await fn()));
+                    }
+                    else {
+                        await option?.dao?.transaction(SyncMode.Async, async () => resolve((await fn())), option?.conn);
+                    }
                 }
-                else {
-                    await option?.dao?.transaction(SyncMode.Async, async () => resolve((await fn())), option?.conn);
+                catch (error) {
+                    reject(error);
                 }
             });
         }
@@ -2004,7 +2367,7 @@ export class SqlService {
     _update(datas, option) {
         const sqls = [];
         const tableName = Sqlstring.escapeId(option?.tableName);
-        const where = `WHEN ${iterare(this[_ids]).map(c => `${this[_fields][c]?.esName} = ?`).join(' AND ')} THEN ?`;
+        const where = `WHEN ${iterare(this[_ids]).map(c => `${this[_fields][c]?.C2()} = ?`).join(' AND ')} THEN ?`;
         const columnMaps = Object.fromEntries(this[_columnsNoId].map(c => [c, {
                 where: new Array(),
                 params: []
@@ -2024,13 +2387,13 @@ export class SqlService {
                 }
             });
         }
-        const sql = `UPDATE ${tableName} SET ${iterare(this[_columnsNoId])
+        const sql = format(`UPDATE ${tableName} SET ${iterare(this[_columnsNoId])
             .filter(K => columnMaps[K].where.length > 0)
             .map(K => {
             params.push(...columnMaps[K].params);
-            return `${this[_fields][K]?.esName} = CASE ${columnMaps[K].where.join(' ')} ELSE ${this[_fields][K]?.esName} END`;
+            return `${this[_fields][K]?.C2()} = CASE ${columnMaps[K].where.join(' ')} ELSE ${this[_fields][K]?.C2()} END`;
         })
-            .join(',')};`;
+            .join(',')};`);
         sqls.push({ sql, params });
         return sqls;
     }
@@ -2052,7 +2415,7 @@ export class SqlService {
                 }, { everyLength: option?.maxDeal });
                 return result.reduce((a, b) => a + b);
             };
-            if (option?.conn?.[_inTransaction] === true) {
+            if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
                 return fn();
             }
             else {
@@ -2074,12 +2437,17 @@ export class SqlService {
                 }, { everyLength: option?.maxDeal });
                 return result.reduce((a, b) => a + b);
             };
-            return new Promise(async (resolve) => {
-                if (option?.conn?.[_inTransaction] === true) {
-                    resolve((await fn()));
+            return new Promise(async (resolve, reject) => {
+                try {
+                    if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+                        resolve((await fn()));
+                    }
+                    else {
+                        await option?.dao?.transaction(SyncMode.Async, async () => resolve((await fn())), option?.conn);
+                    }
                 }
-                else {
-                    await option?.dao?.transaction(SyncMode.Async, async () => resolve((await fn())), option?.conn);
+                catch (error) {
+                    reject(error);
                 }
             });
         }
@@ -2107,20 +2475,21 @@ export class SqlService {
                 return `(
                     ${Object.entries(where).map(([K, V]) => {
                     params.push(V);
-                    return `${K} = ?`;
+                    return `${this[_fields][K]?.C2()} = ?`;
                 }).join(' AND ')}
                 )`;
             }).join(' OR ');
             if (this[_stateFileName] !== undefined && option.forceDelete !== true) {
+                params.unshift(this[_deleteState]);
                 sqls.push({
-                    sql: `
-                    UPDATE ${tableNameESC} SET ${this[_fields][this[_stateFileName]]?.esName} = ${Sqlstring.escape(this[_deleteState])}
+                    sql: format(`
+                    UPDATE ${tableNameESC} SET ${this[_fields][this[_stateFileName]]?.C2()} = ?
                     WHERE ${whereSql};
-                `, params
+                `), params
                 });
             }
             else {
-                sqls.push({ sql: `DELETE FROM ${tableNameESC} WHERE ${whereSql};`, params });
+                sqls.push({ sql: format(`DELETE FROM ${tableNameESC} WHERE ${whereSql};`), params });
             }
         }
         else {
@@ -2132,28 +2501,32 @@ export class SqlService {
                 case DBType.Mysql: {
                     if (this[_stateFileName] !== undefined && option.forceDelete !== true) {
                         sqls.push({
-                            sql: `UPDATE ${tableNameESC} a INNER JOIN ${tableTempESC} b ON ${delWhere.map(K => `a.${this[_fields][K]?.esName} = b.${this[_fields][K]?.esName}`).join(' AND ')}
-                            SET a.${this[_fields][this[_stateFileName]]?.esName} = ${Sqlstring.escape(this[_deleteState])};`
+                            sql: format(`UPDATE ${tableNameESC} a INNER JOIN ${tableTempESC} b ON ${delWhere.map(K => `a.${this[_fields][K]?.C2()} = b.${this[_fields][K]?.C2()}`).join(' AND ')}
+                            SET a.${this[_fields][this[_stateFileName]]?.C2()} = ?;`),
+                            params: [this[_deleteState]]
                         });
                     }
                     else {
                         sqls.push({
-                            sql: `DELETE a.* FROM ${tableNameESC} a INNER JOIN ${tableTempESC} b ON ${delWhere.map(K => `a.${this[_fields][K]?.esName} = b.${this[_fields][K]?.esName}`).join(' AND ')};`
+                            sql: format(`DELETE a.* FROM ${tableNameESC} a INNER JOIN ${tableTempESC} b ON ${delWhere.map(K => `a.${this[_fields][K]?.C2()} = b.${this[_fields][K]?.C2()}`).join(' AND ')};`)
                         });
                     }
+                    break;
                 }
                 case DBType.Sqlite:
                 case DBType.SqliteRemote: {
-                    const columnNames = iterare(delWhere).map(K => this[_fields][K]?.esName).join(',');
+                    const columnNames = iterare(delWhere).map(K => this[_fields][K]?.C2()).join(',');
                     if (this[_stateFileName] !== undefined && option.forceDelete !== true) {
                         sqls.push({
-                            sql: `UPDATE ${tableNameESC} SET ${this[_fields][this[_stateFileName]]?.esName} = ${Sqlstring.escape(this[_deleteState])}
-                            WHERE (${columnNames}) IN (SELECT ${columnNames} FROM ${tableTempESC});`
+                            sql: format(`UPDATE ${tableNameESC} SET ${this[_fields][this[_stateFileName]]?.C2()} = ?
+                            WHERE (${columnNames}) IN (SELECT ${columnNames} FROM ${tableTempESC});`),
+                            params: [this[_deleteState]]
                         });
                     }
                     else {
-                        sqls.push({ sql: `DELETE FROM ${tableNameESC} WHERE (${columnNames}) IN (SELECT ${columnNames} FROM ${tableTempESC});` });
+                        sqls.push({ sql: format(`DELETE FROM ${tableNameESC} WHERE (${columnNames}) IN (SELECT ${columnNames} FROM ${tableTempESC});`) });
                     }
+                    break;
                 }
             }
             sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
@@ -2167,7 +2540,7 @@ export class SqlService {
                 }
                 return result;
             };
-            if (option?.conn?.[_inTransaction] === true) {
+            if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
                 return fn();
             }
             else {
@@ -2183,12 +2556,17 @@ export class SqlService {
                 }
                 return result;
             };
-            return new Promise(async (resolve) => {
-                if (option?.conn?.[_inTransaction] === true) {
-                    resolve((await fn()));
+            return new Promise(async (resolve, reject) => {
+                try {
+                    if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+                        resolve((await fn()));
+                    }
+                    else {
+                        await option?.dao?.transaction(SyncMode.Async, async () => resolve((await fn())), option?.conn);
+                    }
                 }
-                else {
-                    await option?.dao?.transaction(SyncMode.Async, async () => resolve((await fn())), option?.conn);
+                catch (error) {
+                    reject(error);
                 }
             });
         }
@@ -2209,6 +2587,9 @@ export class SqlService {
             case TemplateResult.Count: {
                 return result[0].ct;
             }
+            case TemplateResult.ManyList: {
+                return new ArrayList(result[0]);
+            }
         }
     }
     template(option) {
@@ -2228,19 +2609,19 @@ export class SqlService {
             const ids = option.id instanceof Array ? option.id : [option.id];
             option.where = ids.map(i => ({ [idName]: i }));
         }
-        const columns = option.templateResult === TemplateResult.Count ? 'COUNT(1) ct' : iterare((option.columns ?? this[_columns])).map((K) => `a.${this[_fields][K]?.esName}`).join(',');
+        const columns = option.templateResult === TemplateResult.Count ? 'COUNT(1) ct' : iterare((option.columns ?? this[_columns])).map((K) => `a.${this[_fields][K]?.C3()}`).join(',');
         const wheres = option.where instanceof Array ? option.where : [option.where];
         const sqls = [];
         let resultIndex = -1;
         if (option.mode === SelectMode.Common) {
             const params = new Array();
-            const whereSql = iterare(wheres).map(where => {
+            const whereSql = format(iterare(wheres).map(where => this[_transformer](where, option)).map(where => {
                 return `SELECT ${columns} FROM ${tableNameESC} a WHERE
                     ${Object.entries(where).map(([K, V]) => {
                     params.push(V);
-                    return `${K} = ?`;
+                    return `${this[_fields][K]?.C2()} = ?`;
                 }).join(' AND ')}`;
-            }).join(' UNION ALL ');
+            }).join(' UNION ALL '));
             sqls.push({ sql: whereSql, params });
             resultIndex = 0;
         }
@@ -2250,7 +2631,7 @@ export class SqlService {
             const _sqls = this._createTable({ tableName: tableTemp, temp: true, columns: delWhere, data: wheres, index: 'all', id: 'none' });
             sqls.push(..._sqls);
             resultIndex = sqls.length;
-            sqls.push({ sql: `SELECT ${columns} FROM ${tableNameESC} a INNER JOIN ${tableTempESC} b ON ${delWhere.map(K => `a.${this[_fields][K]?.esName} = b.${this[_fields][K]?.esName}`).join(' AND ')};` });
+            sqls.push({ sql: format(`SELECT ${columns} FROM ${tableNameESC} a INNER JOIN ${tableTempESC} b ON ${delWhere.map(K => `a.${this[_fields][K]?.C2()} = b.${this[_fields][K]?.C2()}`).join(' AND ')};`) });
             sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
         }
         if (option.sync === SyncMode.Sync) {
@@ -2266,143 +2647,189 @@ export class SqlService {
             return this._template(option.templateResult, result, option.error);
         }
         else {
-            return new Promise(async (resolve) => {
-                let result;
-                for (let i = 0; i < sqls.length; i++) {
-                    if (i === resultIndex) {
-                        result = await option.conn.query(SyncMode.Async, sqls[i]?.sql, sqls[i]?.params);
-                    }
-                    else {
-                        await option.conn.execute(SyncMode.Async, sqls[i]?.sql, sqls[i]?.params);
+            return new Promise(async (resolve, reject) => {
+                try {
+                    let result;
+                    for (let i = 0; i < sqls.length; i++) {
+                        if (i === resultIndex) {
+                            result = await option.conn.query(SyncMode.Async, sqls[i]?.sql, sqls[i]?.params);
+                        }
+                        else {
+                            await option.conn.execute(SyncMode.Async, sqls[i]?.sql, sqls[i]?.params);
+                        }
                     }
+                    resolve(this._template(option.templateResult, result, option.error));
+                }
+                catch (error) {
+                    reject(error);
                 }
-                resolve(this._template(option.templateResult, result, option.error));
             });
         }
     }
-    _select(templateResult, result, def, errorMsg, multiple) {
-        if (multiple === true) {
-            switch (templateResult) {
-                case SelectResult.One_Row_One_Column_NotSure: {
-                    try {
-                        return result.map((r) => Object.values(r)[0]);
-                    }
-                    catch (error) {
-                    }
-                }
-                case SelectResult.One_Row_One_Column_Assert: {
-                    try {
-                        return iterare(result).map((r) => Object.values(r)[0]).filter((r) => r !== null).toArray();
-                    }
-                    catch (error) {
-                    }
-                }
-                case SelectResult.One_Row_Many_Column_NotSure: {
-                    try {
-                        return result.map((r) => r[0]);
-                    }
-                    catch (error) {
-                    }
+    _select(templateResult, result, def, errorMsg, hump, mapper, mapperIfUndefined) {
+        switch (templateResult) {
+            case SelectResult.R_C_NotSure: {
+                try {
+                    return Object.values(result[0])[0];
                 }
-                case SelectResult.One_Row_Many_Column_Assert: {
-                    try {
-                        return iterare(result).map((r) => r[0]).filter((r) => r !== null).toArray();
-                    }
-                    catch (error) {
-                    }
+                catch (error) {
+                    return def;
                 }
-                case SelectResult.Many_Row_One_Column: {
-                    try {
-                        return result.map((rx) => rx.map((r) => Object.values(r)[0]));
-                    }
-                    catch (error) {
-                    }
+            }
+            case SelectResult.R_C_Assert: {
+                try {
+                    return Object.values(result[0])[0];
                 }
-                case SelectResult.Many_Row_Many_Column: {
-                    return result;
+                catch (error) {
+                    if (def !== undefined)
+                        return def;
+                    Throw.now(errorMsg ?? 'not found data!');
                 }
             }
-        }
-        else {
-            switch (templateResult) {
-                case SelectResult.One_Row_One_Column_NotSure: {
-                    try {
-                        return Object.values(result[0])[0];
-                    }
-                    catch (error) {
-                        return def;
-                    }
+            case SelectResult.R_CS_NotSure: {
+                if (mapper) {
+                    return flatData({ data: result[0], mapper, mapperIfUndefined });
                 }
-                case SelectResult.One_Row_One_Column_Assert: {
-                    try {
-                        return Object.values(result[0])[0];
-                    }
-                    catch (error) {
-                        if (def !== undefined)
-                            return def;
-                        Throw.now(errorMsg ?? 'not found data!');
-                    }
+                else if (hump === true || (hump === undefined && globalThis[_Hump] === true)) {
+                    return C2P2(result[0]) ?? null;
                 }
-                case SelectResult.One_Row_Many_Column_NotSure: {
+                else {
                     return result[0] ?? null;
                 }
-                case SelectResult.One_Row_Many_Column_Assert: {
-                    const data = result[0];
-                    Throw.if(data === null, errorMsg ?? 'not found data!');
+            }
+            case SelectResult.R_CS_Assert: {
+                const data = result[0];
+                Throw.if(data === null || data === undefined, errorMsg ?? 'not found data!');
+                if (mapper) {
+                    return flatData({ data, mapper, mapperIfUndefined });
+                }
+                else if (hump === true || (hump === undefined && globalThis[_Hump] === true)) {
+                    return C2P2(data) ?? null;
+                }
+                else {
                     return data ?? null;
                 }
-                case SelectResult.Many_Row_One_Column: {
-                    try {
-                        return result.map((r) => Object.values(r)[0]);
-                    }
-                    catch (error) {
-                        return def;
-                    }
+            }
+            case SelectResult.RS_C: {
+                try {
+                    return result.map((r) => Object.values(r)[0]);
                 }
-                case SelectResult.Many_Row_Many_Column: {
+                catch (error) {
                     return result;
                 }
             }
-        }
-    }
-    select(option) {
-        Throw.if(!option.sqlId && !option.sql, 'not found sql!');
-        option.selectResult ?? (option.selectResult = SelectResult.Many_Row_Many_Column);
-        option.defValue ?? (option.defValue = null);
-        const _params = Object.assign({}, option.context, option.params);
-        option.sql ?? (option.sql = globalThis[_sqlCache].load(option.sqlId, { ctx: option.context, isCount: option.isCount, ..._params }));
-        logger.debug(option.sql);
-        const params = [];
-        const sql = option.sql?.replace(/\:(\w+)/g, (txt, key) => {
-            if (_params.hasOwnProperty(key)) {
-                const V = _params[key];
-                params.push(V);
-                return Sqlstring.escape(_params[key]);
+            case SelectResult.RS_CS: {
+                if (mapper) {
+                    return iterare(result).map((data) => flatData({ data, mapper, mapperIfUndefined })).toArray();
+                }
+                else if (hump === true || (hump === undefined && globalThis[_Hump] === true)) {
+                    return iterare(result).map((r) => C2P2(r)).toArray();
+                }
+                else {
+                    return result;
+                }
+            }
+            case SelectResult.RS_C_List: {
+                try {
+                    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(iterare(result).map((data) => flatData({ data, mapper, mapperIfUndefined })).toArray());
+                }
+                else if (hump === true || (hump === undefined && globalThis[_Hump] === true)) {
+                    return new ArrayList(iterare(result).map((r) => C2P2(r)).toArray());
+                }
+                else {
+                    return new ArrayList();
+                }
+            }
+        }
+    }
+    select(option) {
+        Throw.if(!option.sqlId && !option.sql, 'not found sql!');
+        option.selectResult ?? (option.selectResult = SelectResult.RS_CS);
+        option.defValue ?? (option.defValue = null);
+        if (option.sqlId && globalThis[_resultMap_SQLID][option.sqlId] && !option.mapper) {
+            option.mapper = globalThis[_resultMap_SQLID][option.sqlId];
+        }
+        const _params = Object.assign({}, option.context, option.params);
+        option.sql ?? (option.sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: option.isCount, ..._params }));
+        const params = [];
+        const sql = option.sql?.replace(/\:([A-Za-z0-9._]+)/g, (txt, key) => {
+            let V = LGet(_params, key);
+            if (V) {
+                if (V !== undefined) {
+                    params.push(V);
+                }
+                return '?';
+            }
+            const _key = C2P(key);
+            V = LGet(_params, _key);
+            if (V) {
+                if (V !== undefined) {
+                    params.push(V);
+                }
+                return '?';
+            }
+            const __key = P2C(key);
+            V = LGet(_params, __key);
+            if (V) {
+                if (V !== undefined) {
+                    params.push(V);
+                }
+                return '?';
             }
             return txt;
         });
         if (option.sync === SyncMode.Sync) {
             const result = option.conn.query(SyncMode.Sync, sql, params);
-            return this._select(option.selectResult, result, option.defValue, option.errorMsg, option.multiple);
+            return this._select(option.selectResult, result, option.defValue, option.errorMsg, option.hump, option.mapper, option.mapperIfUndefined);
         }
         else {
-            return new Promise(async (resolve) => {
-                const result = await option.conn.query(SyncMode.Async, sql, params);
-                resolve(this._select(option.selectResult, result, option.defValue, option.errorMsg, option.multiple));
+            return new Promise(async (resolve, reject) => {
+                try {
+                    const result = await option.conn.query(SyncMode.Async, sql, params);
+                    resolve(this._select(option.selectResult, result, option.defValue, option.errorMsg, option.hump, option.mapper, option.mapperIfUndefined));
+                }
+                catch (error) {
+                    reject(error);
+                }
             });
         }
     }
     excute(option) {
         Throw.if(!option.sqlId && !option.sql, 'not found sql!');
         const _params = Object.assign({}, option.context, option.params);
-        option.sql ?? (option.sql = globalThis[_sqlCache].load(option.sqlId, { ctx: option.context, ..._params }));
-        logger.debug(option.sql);
+        option.sql ?? (option.sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, ..._params }));
         const params = [];
         const sql = option.sql?.replace(/\:(\w+)/g, (txt, key) => {
-            if (_params.hasOwnProperty(key)) {
-                const V = _params[key];
-                params.push(V);
-                return Sqlstring.escape(_params[key]);
+            let V = LGet(_params, key);
+            if (V) {
+                if (V !== undefined) {
+                    params.push(V);
+                }
+                return '?';
+            }
+            const _key = C2P(key);
+            V = LGet(_params, _key);
+            if (V) {
+                if (V !== undefined) {
+                    params.push(V);
+                }
+                return '?';
+            }
+            const __key = P2C(key);
+            V = LGet(_params, __key);
+            if (V) {
+                if (V !== undefined) {
+                    params.push(V);
+                }
+                return '?';
             }
             return txt;
         });
@@ -2411,9 +2838,14 @@ export class SqlService {
             return result.affectedRows;
         }
         else {
-            return new Promise(async (resolve) => {
-                const result = await option.conn.execute(SyncMode.Async, sql, params);
-                resolve(result.affectedRows);
+            return new Promise(async (resolve, reject) => {
+                try {
+                    const result = await option.conn.execute(SyncMode.Async, sql, params);
+                    resolve(result.affectedRows);
+                }
+                catch (error) {
+                    reject(error);
+                }
             });
         }
     }
@@ -2422,14 +2854,127 @@ export class SqlService {
             return option.dao.transaction(SyncMode.Sync, option.fn);
         }
         else {
-            return new Promise(async (resolve) => {
-                const rt = await option.dao.transaction(SyncMode.Async, option.fn);
-                resolve(rt);
+            return new Promise(async (resolve, reject) => {
+                try {
+                    const rt = await option.dao.transaction(SyncMode.Async, option.fn);
+                    resolve(rt);
+                }
+                catch (error) {
+                    reject(error);
+                }
             });
         }
     }
     stream(option) {
-        return new StreamQuery(option?.tableName ?? this[_tableName], this);
+        return new StreamQuery(option?.tableName ?? this[_tableName], this, this[_fields], this[_columns]);
+    }
+    page(option) {
+        const result = {
+            sum: {},
+            records: [],
+            size: 0,
+            total: 0
+        };
+        Object.assign(option.params, {
+            limitStart: calc(option.pageNumber).sub(1).mul(option.pageSize).over(),
+            limitEnd: calc(option.pageSize).over(),
+            orderBy: option.orderBy
+        });
+        let sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: false, ...option.params });
+        let sqlSum = '';
+        let sqlCount = '';
+        if (option.sumSelf === true) {
+            sqlSum = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: false, isSum: true, ...option.params });
+        }
+        if (option.limitSelf !== true) {
+            if (option.countSelf !== true) {
+            }
+            if (option.orderBy) {
+                sql = `${sql} ORDER BY ${option.orderBy}`;
+            }
+            if (option.pageSize > 0) {
+                sql = `${sql} LIMIT ${option.params['limitStart']}, ${option.pageSize}`;
+            }
+        }
+        if (option.pageSize > 0) {
+            if (option.countSelf === true) {
+                sqlCount = globalThis[_sqlCache].load(this._matchSqlid(`${option.sqlId}_count`), { ctx: option.context, isCount: true, isSum: false, ...option.params });
+            }
+            else {
+                sqlCount = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: true, isSum: false, ...option.params });
+            }
+        }
+        if (option.sync === SyncMode.Sync) {
+            if (sqlCount) {
+                result.total = this.select({
+                    ...option,
+                    sql: sqlCount,
+                    sync: SyncMode.Sync,
+                    selectResult: SelectResult.R_C_Assert
+                });
+                result.size = calc(result.total)
+                    .add(option.pageSize - 1)
+                    .div(option.pageSize)
+                    .round(0, 2)
+                    .over();
+            }
+            if (sqlSum) {
+                result.sum = this.select({
+                    ...option,
+                    sql: sqlSum,
+                    sync: SyncMode.Sync,
+                    selectResult: SelectResult.R_CS_Assert
+                });
+            }
+            if (sql) {
+                result.records = this.select({
+                    ...option,
+                    sql,
+                    sync: SyncMode.Sync,
+                    selectResult: SelectResult.RS_CS
+                });
+            }
+            return result;
+        }
+        else {
+            return new Promise(async (resolve, reject) => {
+                try {
+                    if (sqlCount) {
+                        result.total = await this.select({
+                            ...option,
+                            sql: sqlCount,
+                            sync: SyncMode.Async,
+                            selectResult: SelectResult.R_C_Assert
+                        });
+                        result.size = calc(result.total)
+                            .add(option.pageSize - 1)
+                            .div(option.pageSize)
+                            .round(0, 2)
+                            .over();
+                    }
+                    if (sqlSum) {
+                        result.sum = await this.select({
+                            ...option,
+                            sql: sqlSum,
+                            sync: SyncMode.Async,
+                            selectResult: SelectResult.R_CS_Assert
+                        });
+                    }
+                    if (sql) {
+                        result.records = await this.select({
+                            ...option,
+                            sql,
+                            sync: SyncMode.Async,
+                            selectResult: SelectResult.RS_CS
+                        });
+                    }
+                    resolve(result);
+                }
+                catch (error) {
+                    reject(error);
+                }
+            });
+        }
     }
     /**
     #创建表
@@ -2475,59 +3020,67 @@ export class SqlService {
         tableName = Sqlstring.escapeId(tableName ?? this[_tableName]);
         switch (this[_dbType]) {
             case DBType.Mysql: {
-                let sql = `CREATE ${temp === true ? 'TEMPORARY' : ''} TABLE IF NOT EXISTS ${tableName}(
-                    ${columns.map(K => this[_fields][K][DBType.Mysql]).join(',')}
-                    ${ids && ids.length ? `,PRIMARY KEY (${ids.map(i => this[_fields][i]?.esName).join(',')})  USING BTREE ` : ''}
-                    ${indexs && indexs.length ? `,${indexs.map(i => `KEY ${this[_fields][i]?.esName} (${this[_fields][i]?.esName})`).join(',')} ` : ''}
-                ) ENGINE=MEMORY;`;
+                let sql = format(`CREATE ${temp === true ? 'TEMPORARY' : ''} TABLE IF NOT EXISTS ${tableName}(
+                    ${columns.map(K => this[_fields][K][DBType.Mysql]()).join(',')}
+                    ${ids && ids.length ? `,PRIMARY KEY (${ids.map(i => this[_fields][i]?.C2()).join(',')})  USING BTREE ` : ''}
+                    ${indexs && indexs.length ? `,${indexs.map(i => `KEY ${this[_fields][i]?.C2()} (${this[_fields][i]?.C2()})`).join(',')} ` : ''}
+                ) ENGINE=MEMORY;`);
                 sqls.push({ sql });
                 if (data && data.length > 0) {
                     const params = [];
                     let first = true;
-                    sql = `INSERT INTO ${tableName} (${columns.map(c => Sqlstring.escapeId(c)).join(',')})
+                    sql = format(`INSERT INTO ${tableName} (${columns.map(c => this[_fields][c]?.C2()).join(',')})
                     ${(data).map(d => {
                         const r = `SELECT ${Object.entries(d).map(([K, V]) => {
                             params.push(V);
-                            return `? ${first ? this[_fields][K]?.esName : ''}`;
+                            return `? ${first ? this[_fields][K]?.C2() : ''}`;
                         }).join(',')}`;
                         first = false;
                         return r;
-                    }).join(' UNION ALL ')}`;
+                    }).join(' UNION ALL ')}`);
                     sqls.push({ sql, params });
                 }
                 break;
             }
             case DBType.Sqlite:
             case DBType.SqliteRemote: {
-                let sql = `CREATE ${temp === true ? 'TEMPORARY' : ''} TABLE IF NOT EXISTS ${tableName}(
-                    ${columns.map(K => this[_fields][K][DBType.Sqlite]).join(',')}
-                    ${ids && ids.length ? `,PRIMARY KEY (${ids.map(i => this[_fields][i]?.esName).join(',')}) ` : ''}
-                );`;
+                let sql = format(`CREATE ${temp === true ? 'TEMPORARY' : ''} TABLE IF NOT EXISTS ${tableName}(
+                    ${columns.map(K => this[_fields][K][DBType.Sqlite]()).join(',')}
+                    ${ids && ids.length ? `,PRIMARY KEY (${ids.map(i => this[_fields][i]?.C2()).join(',')}) ` : ''}
+                );`);
                 sqls.push({ sql });
                 if (indexs) {
                     for (const index of indexs) {
-                        sql = `CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${tableName} (${this[_fields][index]?.esName});`;
+                        sql = format(`CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${tableName} (${this[_fields][index]?.C2()});`);
                         sqls.push({ sql });
                     }
                 }
                 if (data && data.length > 0) {
                     const params = [];
                     let first = true;
-                    sql = `INSERT INTO ${tableName} (${columns.map(c => Sqlstring.escapeId(c)).join(',')})
+                    sql = format(`INSERT INTO ${tableName} (${columns.map(c => this[_fields][c]?.C2()).join(',')})
                     ${(data).map(d => {
                         const r = `SELECT ${Object.entries(d).map(([K, V]) => {
                             params.push(V);
-                            return `? ${first ? this[_fields][K]?.esName : ''}`;
+                            return `? ${first ? this[_fields][K]?.C2() : ''}`;
                         }).join(',')}`;
                         first = false;
                         return r;
-                    }).join(' UNION ALL ')}`;
+                    }).join(' UNION ALL ')}`);
                     sqls.push({ sql, params });
                 }
+                break;
             }
         }
         return sqls;
     }
+    _matchSqlid(sqlid) {
+        sqlid ?? (sqlid = '');
+        if (sqlid.includes('.'))
+            return [sqlid];
+        else
+            return [`${this[_tableName]}.${sqlid}`, `${this[_className]}.${sqlid}`, `${this[_ClassName]}.${sqlid}`, `${this[_vueName]}.${sqlid}`];
+    }
 }
 __decorate([
     P(),
@@ -2571,6 +3124,12 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Object)
 ], SqlService.prototype, "transaction", null);
+__decorate([
+    P(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Object)
+], SqlService.prototype, "page", null);
 /** 是否进行下一个动作 */
 const IF_PROCEED = function () {
     return function (_target, _propertyKey, descriptor) {
@@ -2604,8 +3163,8 @@ const IF_EXEC = function (def) {
         };
     };
 };
-class StreamCondition {
-    constructor() {
+class StreamQuery {
+    constructor(table, service, __fields, __columns) {
         this._prefix = 0;
         this._index = 0;
         this._wheres = [];
@@ -2615,7 +3174,18 @@ class StreamCondition {
         this._param = {};
         this.if_proceed = true;
         this.if_exec = true;
+        this._distinct = false;
+        this._columns = [];
+        this._updateColumns = [];
+        this._groups = [];
+        this._orders = [];
+        this._startRow = 0;
+        this._pageSize = 0;
         this._prefix = parseInt(`${Math.random() * 1000}`);
+        this._table = table;
+        this._service = service;
+        this[_fields] = __fields;
+        this[_columns] = __columns;
     }
     /** 将当前stream重置 */
     reset() {
@@ -2623,108 +3193,353 @@ class StreamCondition {
         this._wheres.length = 0;
         this._param = {};
         this._paramKeys = {};
+        this._pageSize = 0;
+        this._startRow = 0;
+        this._orders.length = 0;
+        this._groups.length = 0;
+        this._columns.length = 0;
+        this._updateColumns.length = 0;
         return this;
     }
+    // #region 条件
     /** 为下次链条执行提供条件判断：非异步方法跳过，异步方法不执行并返回默认值 */
     if(condition) {
         this.if_proceed = condition;
         return this;
     }
-    eq(key, value, { name } = {}) { return this._(key, value, '=', { name }); }
-    eqT(t, { name } = {}) {
-        if (name && this._paramKeys[name]) {
-            for (const [key, pname] of Object.entries(this._paramKeys[name])) {
-                this._param[pname] = t[key];
-            }
-        }
-        else {
-            const paramKeys = {};
-            for (const [key, value] of Object.entries(t)) {
-                const pkey = `p${this._prefix}${this._index++}`;
-                this._wheres.push(`AND ${String(key)} = :${pkey} `);
-                this._param[pkey] = value;
-                if (name) {
-                    paramKeys[key] = pkey;
+    eq(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._(key, value, '=', { paramName, skipEmptyString, breakExcuteIfSkip }); }
+    eqT(t, { name: paramName = '', breakExcuteIfSkip = false } = {}) {
+        let exe = false;
+        if (t) {
+            t = this._service[_transformer](t, {
+                skipNull: true,
+                skipUndefined: true,
+                skipEmptyString: true
+            });
+            const keys = Object.keys(t);
+            if (keys.length > 0) {
+                if (paramName && this._paramKeys[paramName]) {
+                    for (const [key, pname] of Object.entries(this._paramKeys[paramName])) {
+                        this._param[pname] = t[key];
+                    }
                 }
-            }
-            if (name) {
-                this._paramKeys[name] = paramKeys;
+                else {
+                    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._param[pkey] = value;
+                        if (paramName) {
+                            paramKeys[key] = pkey;
+                        }
+                    }
+                    if (paramName) {
+                        this._paramKeys[paramName] = paramKeys;
+                    }
+                }
+                exe = true;
             }
         }
+        if (breakExcuteIfSkip === true && exe === false) {
+            this.if_exec = false;
+        }
         return this;
     }
-    notEq(key, value, { name } = {}) { return this._(key, value, '<>', { name }); }
+    notEq(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._(key, value, '<>', { paramName, skipEmptyString, breakExcuteIfSkip }); }
     eqWith(key1, key2) { return this._key(key1, key2, '='); }
     notEqWith(key1, key2) { return this._key(key1, key2, '<>'); }
-    regexp(key, regexp, { name } = {}) { return this._(key, regexp, 'REGEXP', { name }); }
-    notRegexp(key, regexp, { name } = {}) { return this._(key, regexp, 'REGEXP', { name, not: 'NOT' }); }
+    regexp(key, regexp, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._(key, regexp, 'REGEXP', { paramName, skipEmptyString: true, breakExcuteIfSkip }); }
+    notRegexp(key, regexp, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._(key, regexp, 'REGEXP', { paramName, skipEmptyString: true, not: 'NOT', breakExcuteIfSkip }); }
     /** (key1 << 8) + key2 = value */
-    shiftEq(key1, key2, value, { name } = {}) { return this._shift(key1, key2, value, '=', { name }); }
+    shiftEq(key1, key2, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._shift(key1, key2, value, '=', { paramName, breakExcuteIfSkip }); }
     /** (key1 << 8) + key2 <> value */
-    shiftNotEq(key1, key2, value, { name } = {}) { return this._shift(key1, key2, value, '<>', { name }); }
-    grate(key, value, { name } = {}) { return this._(key, value, '>', { name }); }
-    grateEq(key, value, { name } = {}) { return this._(key, value, '>=', { name }); }
+    shiftNotEq(key1, key2, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._shift(key1, key2, value, '<>', { paramName, breakExcuteIfSkip }); }
+    grate(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._(key, value, '>', { paramName, skipEmptyString: true, breakExcuteIfSkip }); }
+    grateEq(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._(key, value, '>=', { paramName, skipEmptyString: true, breakExcuteIfSkip }); }
     grateWith(key1, key2) { return this._key(key1, key2, '>'); }
     grateEqWith(key1, key2) { return this._key(key1, key2, '>='); }
-    less(key, value, { name } = {}) { return this._(key, value, '<', { name }); }
-    lessEq(key, value, { name } = {}) { return this._(key, value, '<=', { name }); }
+    less(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._(key, value, '<', { paramName, skipEmptyString: true, breakExcuteIfSkip }); }
+    lessEq(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._(key, value, '<=', { paramName, skipEmptyString: true, breakExcuteIfSkip }); }
     lessWith(key1, key2) { return this._key(key1, key2, '<'); }
     lessEqWith(key1, key2) { return this._key(key1, key2, '<='); }
-    like(key, value, { name, force } = {}) { return this._like(key, value, { name, left: '%', right: '%', force }); }
-    notLike(key, value, { name, force } = {}) { return this._like(key, value, { name, left: '%', right: '%', not: 'NOT', force }); }
-    leftLike(key, value, { name, force } = {}) { return this._like(key, value, { name, left: '%', force }); }
-    notLeftLike(key, value, { name, force } = {}) { return this._like(key, value, { name, left: '%', not: 'NOT', force }); }
-    rightLike(key, value, { name, force } = {}) { return this._like(key, value, { name, right: '%', force }); }
-    notRightLike(key, value, { name, force } = {}) { return this._like(key, value, { name, right: '%', not: 'NOT', force }); }
-    PreciseLike(key, value, { name, force } = {}) { return this._like(key, value, { name, force }); }
-    notPreciseLike(key, value, { name, force } = {}) { return this._like(key, value, { name, not: 'NOT', force }); }
-    glob(key, value, { name, force } = {}) { return this._like(key, value, { name, left: '%', right: '%', force, op: 'glob' }); }
-    notGlob(key, value, { name, force } = {}) { return this._like(key, value, { name, left: '%', right: '%', not: 'NOT', force, op: 'glob' }); }
-    leftGlob(key, value, { name, force } = {}) { return this._like(key, value, { name, left: '%', force, op: 'glob' }); }
-    notLeftGlob(key, value, { name, force } = {}) { return this._like(key, value, { name, left: '%', not: 'NOT', force, op: 'glob' }); }
-    rightGlob(key, value, { name, force } = {}) { return this._like(key, value, { name, right: '%', force, op: 'glob' }); }
-    notRightGlob(key, value, { name, force } = {}) { return this._like(key, value, { name, right: '%', not: 'NOT', force, op: 'glob' }); }
-    PreciseGlob(key, value, { name, force } = {}) { return this._like(key, value, { name, force, op: 'glob' }); }
-    notPreciseGlob(key, value, { name, force } = {}) { return this._like(key, value, { name, not: 'NOT', force, op: 'glob' }); }
-    in(key, value, { name, force } = {}) { return this._in(key, value, { name, force }); }
-    notIn(key, value, { name, force } = {}) { return this._in(key, value, { name, not: 'NOT', force }); }
+    like(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', right: '%', breakExcuteIfSkip }); }
+    notLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', right: '%', not: 'NOT', breakExcuteIfSkip }); }
+    leftLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', breakExcuteIfSkip }); }
+    notLeftLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', not: 'NOT', breakExcuteIfSkip }); }
+    rightLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, right: '%', breakExcuteIfSkip }); }
+    notRightLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, right: '%', not: 'NOT', breakExcuteIfSkip }); }
+    PreciseLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, breakExcuteIfSkip }); }
+    notPreciseLike(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip }); }
+    glob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', right: '%', breakExcuteIfSkip, op: 'GLOB' }); }
+    notGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', right: '%', not: 'NOT', breakExcuteIfSkip, op: 'GLOB' }); }
+    leftGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', breakExcuteIfSkip, op: 'GLOB' }); }
+    notLeftGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, left: '%', not: 'NOT', breakExcuteIfSkip, op: 'GLOB' }); }
+    rightGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, right: '%', breakExcuteIfSkip, op: 'GLOB' }); }
+    notRightGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, right: '%', not: 'NOT', breakExcuteIfSkip, op: 'GLOB' }); }
+    PreciseGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, breakExcuteIfSkip, op: 'GLOB' }); }
+    notPreciseGlob(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._like(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip, op: 'GLOB' }); }
+    in(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._in(key, value, { paramName, breakExcuteIfSkip }); }
+    notIn(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._in(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip }); }
     isNULL(key) { return this._null(key); }
     isNotNULL(key) { return this._null(key, 'NOT'); }
-    between(key, value1, value2, { name } = {}) { return this._between(key, value1, value2, { name }); }
-    notBetween(key, value1, value2, { name } = {}) { return this._between(key, value1, value2, { name, not: 'NOT' }); }
-    pow(key, value, { name } = {}) { return this._pow(key, value, { name }); }
-    notPow(key, value, { name } = {}) { return this._pow(key, value, { name, not: 'NOT' }); }
-    powWith(key, values, { name } = {}) { return this._pow(key, add(...values.map(value => Math.pow(2, +value))), { name }); }
-    notPowWith(key, values, { name } = {}) { return this._pow(key, add(...values.map(value => Math.pow(2, +value))), { name, not: 'NOT' }); }
+    between(key, value1, value2, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._between(key, value1, value2, { paramName, skipEmptyString, breakExcuteIfSkip }); }
+    notBetween(key, value1, value2, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._between(key, value1, value2, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip }); }
+    pow(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._pow(key, value, { paramName, breakExcuteIfSkip }); }
+    notPow(key, value, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._pow(key, value, { paramName, not: 'NOT', breakExcuteIfSkip }); }
+    powWith(key, values, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._pow(key, add(...values.map(value => Math.pow(2, +value))), { paramName, breakExcuteIfSkip }); }
+    notPowWith(key, values, { paramName = '', breakExcuteIfSkip = false } = {}) { return this._pow(key, add(...values.map(value => Math.pow(2, +value))), { paramName, not: 'NOT', breakExcuteIfSkip }); }
     /** MATCH(key1, key2, key3) AGAINST (value) */
-    match(value, keys, { name } = {}) { return this._match(value, keys, { name }); }
+    match(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._match(value, keys, { paramName, skipEmptyString, breakExcuteIfSkip }); }
     /** NOT MATCH(key1, key2, key3) AGAINST (value) */
-    notMatch(value, keys, { name } = {}) { return this._match(value, keys, { name, not: 'NOT' }); }
+    notMatch(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._match(value, keys, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip }); }
     /** MATCH(key1, key2, key3) AGAINST (value) IN BOOLEAN MODE*/
-    matchBoolean(value, keys, { name } = {}) { return this._match(value, keys, { name, append: 'IN BOOLEAN MODE' }); }
+    matchBoolean(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._match(value, keys, { paramName, skipEmptyString, breakExcuteIfSkip, append: 'IN BOOLEAN MODE' }); }
     /** NOT MATCH(key1, key2, key3) AGAINST (value) IN BOOLEAN MODE */
-    notMatchBoolean(value, keys, { name } = {}) { return this._match(value, keys, { name, not: 'NOT', append: 'IN BOOLEAN MODE' }); }
+    notMatchBoolean(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._match(value, keys, { paramName, skipEmptyString, breakExcuteIfSkip, not: 'NOT', append: 'IN BOOLEAN MODE' }); }
     /** MATCH(key1, key2, key3) AGAINST (value) WITH QUERY EXPANSION*/
-    matchQuery(value, keys, { name } = {}) { return this._match(value, keys, { name, append: 'WITH QUERY EXPANSION' }); }
+    matchQuery(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._match(value, keys, { paramName, skipEmptyString, breakExcuteIfSkip, append: 'WITH QUERY EXPANSION' }); }
     /** NOT MATCH(key1, key2, key3) AGAINST (value) WITH QUERY EXPANSION*/
-    notMatchQuery(value, keys, { name } = {}) { return this._match(value, keys, { name, not: 'NOT', append: 'WITH QUERY EXPANSION' }); }
-    includes(key, value, { name } = {}) { return this._includes(key, value, { name }); }
-    notIncludes(key, value, { name } = {}) { return this._includes(key, value, { name, not: 'NOT' }); }
-    and(fn) { const stream = new StreamCondition(); const ret = fn(stream); if (ret !== false) {
-        this._andQuerys.push(stream);
-    } return this; }
-    or(fn) { const stream = new StreamCondition(); const ret = fn(stream); if (ret !== false) {
-        this._orQuerys.push(stream);
-    } return this; }
-    where() {
+    notMatchQuery(value, keys, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._match(value, keys, { paramName, skipEmptyString, breakExcuteIfSkip, not: 'NOT', append: 'WITH QUERY EXPANSION' }); }
+    includes(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._includes(key, value, { paramName, skipEmptyString, breakExcuteIfSkip }); }
+    notIncludes(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._includes(key, value, { paramName, skipEmptyString, not: 'NOT', breakExcuteIfSkip }); }
+    and(fn) {
+        if (fn instanceof StreamQuery) {
+            this._andQuerys.push(fn);
+        }
+        else {
+            const stream = new StreamQuery(this._table, this._service, this[_fields], this[_columns]);
+            const ret = fn(stream);
+            if (ret !== false) {
+                this._andQuerys.push(stream);
+            }
+        }
+        return this;
+    }
+    or(fn) {
+        if (fn instanceof StreamQuery) {
+            this._andQuerys.push(fn);
+        }
+        else {
+            const stream = new StreamQuery(this._table, this._service, this[_fields], this[_columns]);
+            const ret = fn(stream);
+            if (ret !== false) {
+                this._orQuerys.push(stream);
+            }
+        }
+        return this;
+    }
+    groupBy(...keys) { this._groups.push(...keys.map(key => `${this[_fields][String(key)]?.C2()}`)); return this; }
+    groupBy2(...keys) { this._groups.push(...keys); return this; }
+    asc(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} ASC`)); return this; }
+    asc2(...keys) { this._orders.push(...keys.map(key => `${key} ASC`)); return this; }
+    desc(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} DESC`)); return this; }
+    desc2(...keys) { this._orders.push(...keys.map(key => `${key} ASC`)); return this; }
+    limit(startRow, pageSize) { this._startRow = startRow; this._pageSize = pageSize; return this; }
+    page(pageNumber, pageSize) { this._startRow = ((pageNumber || 1) - 1) * pageSize; this._pageSize = pageSize; return this; }
+    table(_table) { this._table = _table; return this; }
+    distinct(on = true) { this._distinct = on; return this; }
+    countDistinct(key, countName) { this._columns.push(`COUNT(DISTINCT ${this[_fields][String(key)]?.C2()}) ${countName || `${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; }
+    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`)} ` : ''}
+            SEPARATOR '${param && param.separator || ','}'
+            ) ${param && param.groupName || `${this[_fields][String(key)]?.C2()}`}`);
+        return this;
+    }
+    select(...key) { this._columns.push(...(key.map(k => this[_fields][String(k)].C3()))); return this; }
+    select2(sql, param) { this._columns.push(`${sql}`); Object.assign(this._param, param); return this; }
+    update(key, value) { this._updates ?? (this._updates = {}); this._updates[key] = value; return this; }
+    update2(sql, param) { this._updateColumns.push(sql); Object.assign(this._param, param); return this; }
+    updateT(t) { this._updates ?? (this._updates = {}); Object.assign(this._updates, t); return this; }
+    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._param[pkey1] = valueToFind;
+        this._param[pkey2] = valueToReplace;
+        return this;
+    }
+    excuteSelect(option) {
+        option ?? (option = {});
+        option.sync ?? (option.sync = SyncMode.Async);
+        option.selectResult ?? (option.selectResult = SelectResult.RS_CS);
+        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 ${this._table}
+            ${where ? ' WHERE ' : ''}
+            ${where}
+            ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
+            ${this._orders.length > 0 ? `ORDER BY ${this._orders.join(',')} ` : ''}
+        `;
+        if (this._startRow && this._pageSize) {
+            sql += `LIMIT ${this._startRow}, ${this._pageSize}`;
+        }
+        else if (this._startRow) {
+            sql += `LIMIT ${this._startRow}`;
+        }
+        if (option.sync === SyncMode.Async) {
+            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 });
+                case SelectResult.R_C_NotSure: return this._service.select({ ...option, sync: SyncMode.Async, selectResult: SelectResult.R_C_NotSure, sql, params });
+            }
+        }
+        else {
+            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 });
+                case SelectResult.R_C_NotSure: return this._service.select({ ...option, sync: SyncMode.Sync, selectResult: SelectResult.R_C_NotSure, sql, params });
+            }
+        }
+    }
+    excutePage(option) {
+        option ?? (option = {});
+        option.sync ?? (option.sync = SyncMode.Async);
+        const { where, params } = this._where();
+        const result = {
+            records: [],
+            size: 0,
+            total: 0
+        };
+        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 ${this._table}
+            ${where ? ' WHERE ' : ''}
+            ${where}
+            ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
+            ${this._orders.length > 0 ? `ORDER BY ${this._orders.join(',')} ` : ''}
+        `;
+        if (this._startRow && this._pageSize) {
+            sql += `LIMIT ${this._startRow}, ${this._pageSize}`;
+        }
+        else if (this._startRow) {
+            sql += `LIMIT ${this._startRow}`;
+        }
+        const sqlCount = `
+            SELECT COUNT(1)
+            FROM ${this._table}
+            ${where ? ' WHERE ' : ''}
+            ${where}
+            ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
+            ${this._orders.length > 0 ? `ORDER BY ${this._orders.join(',')} ` : ''}
+        `;
+        if (option.sync === SyncMode.Sync) {
+            result.total = this._service.select({
+                ...option,
+                params,
+                sql: sqlCount,
+                sync: SyncMode.Sync,
+                selectResult: SelectResult.R_C_Assert
+            });
+            result.size = calc(result.total)
+                .add(this._pageSize - 1)
+                .div(this._pageSize)
+                .round(0, 2)
+                .over();
+            result.records = this._service.select({
+                ...option,
+                params,
+                sql,
+                sync: SyncMode.Sync,
+                selectResult: SelectResult.RS_CS
+            });
+            return result;
+        }
+        else {
+            return new Promise(async (resolve, reject) => {
+                try {
+                    result.total = await this._service.select({
+                        ...option,
+                        params,
+                        sql: sqlCount,
+                        sync: SyncMode.Async,
+                        selectResult: SelectResult.R_C_Assert
+                    });
+                    result.size = calc(result.total)
+                        .add(this._pageSize - 1)
+                        .div(this._pageSize)
+                        .round(0, 2)
+                        .over();
+                    result.records = await this._service.select({
+                        ...option,
+                        params,
+                        sql,
+                        sync: SyncMode.Async,
+                        selectResult: SelectResult.RS_CS
+                    });
+                    resolve(result);
+                }
+                catch (error) {
+                    reject(error);
+                }
+            });
+        }
+    }
+    excuteUpdate(option) {
+        option ?? (option = {});
+        option.sync ?? (option.sync = SyncMode.Async);
+        const { where, params } = this._where();
+        const sets = new Array(...this._updateColumns);
+        if (this._updates) {
+            for (const [K, V] of Object.entries(this._updates)) {
+                const pkey = `p${this._prefix}${this._index++}`;
+                sets.push(` ${K} = :${pkey} `);
+                params[pkey] = V;
+            }
+        }
+        if (sets.length > 0) {
+            const sql = `UPDATE ${this._table} SET ${sets.join(',')} ${where}`;
+            if (option.sync === SyncMode.Async) {
+                return this._service.excute({ sync: SyncMode.Async, sql, params });
+            }
+            else {
+                return this._service.excute({ sync: SyncMode.Sync, sql, params });
+            }
+        }
+        else {
+            return 0;
+        }
+    }
+    excuteDelete(option) {
+        option ?? (option = {});
+        option.sync ?? (option.sync = SyncMode.Async);
+        const { where, params } = this._where();
+        const sql = `DELETE FROM ${this._table} ${where}`;
+        if (option.sync === SyncMode.Async) {
+            return this._service.excute({ sync: SyncMode.Async, sql, params });
+        }
+        else {
+            return this._service.excute({ sync: SyncMode.Sync, sql, params });
+        }
+    }
+    _where() {
         const wheres = new Array();
         const sql = this._wheres.join(' ');
         if (sql) {
-            wheres.push(`(${sql})`);
+            wheres.push(`(${sql.replace(/^and|^or/i, '')})`);
         }
         if (this._orQuerys.length > 0) {
             for (const query of this._orQuerys) {
-                const { where, params } = query.where();
+                const { where, params } = query._where();
                 if (where) {
                     wheres.push(` OR (${where}) `);
                 }
@@ -2733,7 +3548,7 @@ class StreamCondition {
         }
         if (this._andQuerys.length > 0) {
             for (const query of this._andQuerys) {
-                const { where, params } = query.where();
+                const { where, params } = query._where();
                 if (where) {
                     wheres.push(` AND (${where}) `);
                 }
@@ -2742,134 +3557,189 @@ class StreamCondition {
         }
         return { where: wheres.join(' '), params: this._param };
     }
-    _(key, value, op, { not = '', name = '' } = {}) {
-        if (name !== undefined && this._paramKeys.hasOwnProperty(name)) {
-            this._param[this._paramKeys[name]] = value;
+    _(key, value, op, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
+        if (value === null
+            || value === undefined
+            || (emptyString(`${value ?? ''}`) && skipEmptyString === true)) {
+            if (breakExcuteIfSkip === true) {
+                this.if_exec = false;
+            }
+            return this;
+        }
+        if (paramName !== undefined && this._paramKeys.hasOwnProperty(paramName)) {
+            this._param[this._paramKeys[paramName]] = value;
         }
         else {
+            paramName;
             const pkey = `p${this._prefix}${this._index++}`;
-            this._wheres.push(`AND ${String(key)} ${not} ${op} :${pkey} `);
+            this._wheres.push(`AND ${this[_fields][String(key)]?.C2()} ${not} ${op} :${pkey} `);
             this._param[pkey] = value;
-            if (name) {
-                this._paramKeys[name] = pkey;
+            if (paramName) {
+                this._paramKeys[paramName] = pkey;
             }
         }
         return this;
     }
     _null(key, not = '') {
-        this._wheres.push(`AND ${String(key)} is ${not} null`);
+        this._wheres.push(`AND ${this[_fields][String(key)]?.C2()} IS ${not} NULL`);
         return this;
     }
     _key(key1, key2, op, not = '') {
-        this._wheres.push(`AND ${String(key1)} ${not} ${op} ${String(key2)} `);
+        this._wheres.push(`AND ${this[_fields][String(key1)]?.C2()} ${not} ${op} ${this[_fields][String(key2)]?.C2()} `);
         return this;
     }
-    _between(key, value1, value2, { not = '', name = '' } = {}) {
-        if (name && this._paramKeys[name]) {
-            this._param[this._paramKeys[name][0]] = value1;
-            this._param[this._paramKeys[name][1]] = value2;
+    _between(key, value1, value2, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
+        if (value1 === null
+            || value1 === undefined
+            || (emptyString(`${value1 ?? ''}`) && skipEmptyString === true)
+            || value2 === null
+            || value2 === undefined
+            || (emptyString(`${value2 ?? ''}`) && skipEmptyString === true)) {
+            if (breakExcuteIfSkip === true) {
+                this.if_exec = false;
+            }
+            return this;
+        }
+        if (paramName && this._paramKeys[paramName]) {
+            this._param[this._paramKeys[paramName][0]] = value1;
+            this._param[this._paramKeys[paramName][1]] = value2;
         }
         else {
             const [pkey1, pkey2] = [`p${this._prefix}${this._index++}`, `p${this._prefix}${this._index++}`];
-            this._wheres.push(`AND ${String(key)} ${not} BETWEEN :${pkey1} AND :${pkey2}`);
+            this._wheres.push(`AND ${this[_fields][String(key)]?.C2()} ${not} BETWEEN :${pkey1} AND :${pkey2}`);
             this._param[pkey1] = value1;
             this._param[pkey2] = value2;
-            if (name) {
-                this._paramKeys[name] = [pkey1, pkey2];
+            if (paramName) {
+                this._paramKeys[paramName] = [pkey1, pkey2];
             }
         }
         return this;
     }
-    _in(key, value, { not = '', name = '', force = false } = {}) {
+    _in(key, value, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
         if (value && value.length > 0) {
-            if (name !== undefined && this._paramKeys.hasOwnProperty(name)) {
-                this._param[this._paramKeys[name]] = value;
+            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 ${String(key)} ${not} IN (:${pkey}) `);
+                this._wheres.push(`AND ${this[_fields][String(key)]?.C2()} ${not} IN (:${pkey}) `);
                 this._param[pkey] = value;
-                if (name) {
-                    this._paramKeys[name] = pkey;
+                if (paramName) {
+                    this._paramKeys[paramName] = pkey;
                 }
             }
         }
-        else if (force !== true) {
+        else if (breakExcuteIfSkip !== true) {
             this.if_exec = false;
         }
         return this;
     }
-    _shift(key1, key2, value, op, { not = '', name = '' } = {}) {
-        if (name !== undefined && this._paramKeys.hasOwnProperty(name)) {
-            this._param[this._paramKeys[name]] = value;
+    _shift(key1, key2, value, op, { not = '', paramName = '', breakExcuteIfSkip = false } = {}) {
+        if (value === null
+            || value === undefined
+            || emptyString(`${value ?? ''}`)) {
+            if (breakExcuteIfSkip === true) {
+                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 (${String(key1)} << 8) + ${String(key2)} ${not} ${op} :${pkey} `);
+            this._wheres.push(`AND (${this[_fields][String(key1)]?.C2()} << 8) + ${this[_fields][String(key2)]?.C2()} ${not} ${op} :${pkey} `);
             this._param[pkey] = value;
-            if (name) {
-                this._paramKeys[name] = pkey;
+            if (paramName) {
+                this._paramKeys[paramName] = pkey;
             }
         }
         return this;
     }
-    _match(value, keys, { name, not, append } = {}) {
-        if (name !== undefined && this._paramKeys.hasOwnProperty(name)) {
-            this._param[this._paramKeys[name]] = value;
+    _match(value, keys, { paramName = '', not = '', append = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
+        if (value === null
+            || value === undefined
+            || emptyString(`${value ?? ''}`)) {
+            if (breakExcuteIfSkip === true) {
+                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 MATCH(${keys.join(',')}) AGAINST (:${pkey} ${append ?? ''})`);
+            this._wheres.push(`AND ${not} MATCH(${keys.map(key => this[_fields][String(key)]?.C2()).join(',')}) AGAINST (:${pkey} ${append ?? ''})`);
             this._param[pkey] = value;
-            if (name) {
-                this._paramKeys[name] = pkey;
+            if (paramName) {
+                this._paramKeys[paramName] = pkey;
             }
         }
         return this;
     }
-    _pow(key, value, { name } = {}) {
-        if (name !== undefined && this._paramKeys.hasOwnProperty(name)) {
-            this._param[this._paramKeys[name]] = value;
+    _pow(key, value, { not = '', paramName = '', breakExcuteIfSkip = false } = {}) {
+        if (value === null
+            || value === undefined
+            || emptyString(`${value ?? ''}`)) {
+            if (breakExcuteIfSkip === true) {
+                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, ${String(key)}) & :${pkey}`);
+            this._wheres.push(`AND ${not} POW(2, ${this[_fields][String(key)]?.C2()}) & :${pkey}`);
             this._param[pkey] = value;
-            if (name) {
-                this._paramKeys[name] = pkey;
+            if (paramName) {
+                this._paramKeys[paramName] = pkey;
             }
         }
         return this;
     }
-    _like(key, value, { not = '', left = '', right = '', name = '', op = 'LIKE', force = false } = {}) {
-        if (value !== null && value !== undefined && value !== '') {
-            if (name !== undefined && this._paramKeys.hasOwnProperty(name)) {
-                this._param[this._paramKeys[name]] = value;
-            }
-            else {
-                const pkey = `p${this._prefix}${this._index++}`;
-                this._wheres.push(`AND ${String(key)} ${not} ${op} CONCAT('${left}', :${pkey}, '${right}') `);
-                this._param[pkey] = value;
-                if (name) {
-                    this._paramKeys[name] = pkey;
-                }
+    _like(key, value, { not = '', left = '', right = '', paramName = '', op = 'LIKE', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
+        if (value === null
+            || value === undefined
+            || (emptyString(`${value ?? ''}`) && skipEmptyString === true)) {
+            if (breakExcuteIfSkip === true) {
+                this.if_exec = false;
             }
+            return this;
         }
-        else if (force !== true) {
-            this.if_exec = false;
+        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 ${this[_fields][String(key)]?.C2()} ${not} ${op} CONCAT('${left}', :${pkey}, '${right}') `);
+            this._param[pkey] = value;
+            if (paramName) {
+                this._paramKeys[paramName] = pkey;
+            }
         }
         return this;
     }
-    _includes(key, value, { not = '', name = '' } = {}) {
-        if (name !== undefined && this._paramKeys.hasOwnProperty(name)) {
-            this._param[this._paramKeys[name]] = value;
+    _includes(key, value, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfSkip = true } = {}) {
+        if (value === null
+            || value === undefined
+            || (emptyString(`${value ?? ''}`) && skipEmptyString === true)) {
+            if (breakExcuteIfSkip === true) {
+                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(${String(key)}, :${pkey}) ${not ? '=' : ''}  0`);
+            this._wheres.push(`AND LOCATE(${this[_fields][String(key)]?.C2()}, :${pkey}) ${not ? '=' : '>'}  0`);
             this._param[pkey] = value;
-            if (name) {
-                this._paramKeys[name] = pkey;
+            if (paramName) {
+                this._paramKeys[paramName] = pkey;
             }
         }
         return this;
@@ -2880,576 +3750,496 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Boolean]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "if", null);
+], StreamQuery.prototype, "if", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "eq", null);
+], StreamQuery.prototype, "eq", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "eqT", null);
+], StreamQuery.prototype, "eqT", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "notEq", null);
+], StreamQuery.prototype, "notEq", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "eqWith", null);
+], StreamQuery.prototype, "eqWith", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "notEqWith", null);
+], StreamQuery.prototype, "notEqWith", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, String, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "regexp", null);
+], StreamQuery.prototype, "regexp", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, String, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "notRegexp", null);
+], StreamQuery.prototype, "notRegexp", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Number, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "shiftEq", null);
+], StreamQuery.prototype, "shiftEq", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Number, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "shiftNotEq", null);
+], StreamQuery.prototype, "shiftNotEq", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "grate", null);
+], StreamQuery.prototype, "grate", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "grateEq", null);
+], StreamQuery.prototype, "grateEq", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "grateWith", null);
+], StreamQuery.prototype, "grateWith", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "grateEqWith", null);
+], StreamQuery.prototype, "grateEqWith", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "less", null);
+], StreamQuery.prototype, "less", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "lessEq", null);
+], StreamQuery.prototype, "lessEq", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "lessWith", null);
+], StreamQuery.prototype, "lessWith", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "lessEqWith", null);
+], StreamQuery.prototype, "lessEqWith", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "like", null);
+], StreamQuery.prototype, "like", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "notLike", null);
+], StreamQuery.prototype, "notLike", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "leftLike", null);
+], StreamQuery.prototype, "leftLike", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "notLeftLike", null);
+], StreamQuery.prototype, "notLeftLike", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "rightLike", null);
+], StreamQuery.prototype, "rightLike", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "notRightLike", null);
+], StreamQuery.prototype, "notRightLike", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "PreciseLike", null);
+], StreamQuery.prototype, "PreciseLike", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "notPreciseLike", null);
+], StreamQuery.prototype, "notPreciseLike", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "glob", null);
+], StreamQuery.prototype, "glob", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "notGlob", null);
+], StreamQuery.prototype, "notGlob", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "leftGlob", null);
+], StreamQuery.prototype, "leftGlob", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "notLeftGlob", null);
+], StreamQuery.prototype, "notLeftGlob", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "rightGlob", null);
+], StreamQuery.prototype, "rightGlob", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "notRightGlob", null);
+], StreamQuery.prototype, "notRightGlob", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.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)
-], StreamCondition.prototype, "notPreciseGlob", null);
+], StreamQuery.prototype, "notPreciseGlob", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Array, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "in", null);
+], StreamQuery.prototype, "in", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Array, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "notIn", null);
+], StreamQuery.prototype, "notIn", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "isNULL", null);
+], StreamQuery.prototype, "isNULL", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "isNotNULL", null);
+], StreamQuery.prototype, "isNotNULL", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "between", null);
+], StreamQuery.prototype, "between", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "notBetween", null);
+], StreamQuery.prototype, "notBetween", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Number, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "pow", null);
+], StreamQuery.prototype, "pow", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Number, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "notPow", null);
+], StreamQuery.prototype, "notPow", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Array, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "powWith", null);
+], StreamQuery.prototype, "powWith", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Array, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "notPowWith", null);
+], StreamQuery.prototype, "notPowWith", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Array, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "match", null);
+], StreamQuery.prototype, "match", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Array, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "notMatch", null);
+], StreamQuery.prototype, "notMatch", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Array, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "matchBoolean", null);
+], StreamQuery.prototype, "matchBoolean", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Array, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "notMatchBoolean", null);
+], StreamQuery.prototype, "notMatchBoolean", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Array, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "matchQuery", null);
+], StreamQuery.prototype, "matchQuery", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Array, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "notMatchQuery", null);
+], StreamQuery.prototype, "notMatchQuery", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "includes", null);
+], StreamQuery.prototype, "includes", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "notIncludes", null);
+], StreamQuery.prototype, "notIncludes", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Function]),
+    __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "and", null);
+], StreamQuery.prototype, "and", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Function]),
+    __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
-], StreamCondition.prototype, "or", null);
-class StreamBuild extends StreamCondition {
-    constructor(table) {
-        super();
-        this._distinct = false;
-        this._columns = [];
-        this._updateColumns = [];
-        this._groups = [];
-        this._orders = [];
-        this._startRow = 0;
-        this._pageSize = 0;
-        this._table = table;
-    }
-    /** 将当前stream重置 */
-    reset() {
-        super.reset();
-        this._pageSize = 0;
-        this._startRow = 0;
-        this._orders.length = 0;
-        this._groups.length = 0;
-        this._columns.length = 0;
-        this._updateColumns.length = 0;
-        return this;
-    }
-    groupBy(key) { this._groups.push(key); return this; }
-    asc(...keys) { this._orders.push(...keys.map(key => `${String(key)} ASC`)); return this; }
-    desc(...keys) { this._orders.push(...keys.map(key => `${String(key)} DESC`)); return this; }
-    limit(startRow, pageSize) { this._startRow = startRow; this._pageSize = pageSize; return this; }
-    page(pageNumber, pageSize) { this._startRow = ((pageNumber || 1) - 1) * pageSize; this._pageSize = pageSize; return this; }
-    table(_table) { this._table = _table; return this; }
-    distinct(on = true) { this._distinct = on; return this; }
-    count(key, countName, distinct) { this._columns.push(`COUNT(${distinct ? 'DISTINCT' : ''} ${String(key)}) ${countName || `${String(key)}`}`); return this; }
-    sum(key, legName, distinct) { this._columns.push(`SUM(${distinct ? 'DISTINCT' : ''} ${String(key)}) ${legName || `${String(key)}`}`); return this; }
-    avg(key, legName, distinct) { this._columns.push(`AVG(${distinct ? 'DISTINCT' : ''} ${String(key)}) ${legName || `${String(key)}`}`); return this; }
-    max(key, legName, distinct) { this._columns.push(`MAX(${distinct ? 'DISTINCT' : ''} ${String(key)}) ${legName || `${String(key)}`}`); return this; }
-    min(key, legName, distinct) { this._columns.push(`MIN(${distinct ? 'DISTINCT' : ''} ${String(key)}) ${legName || `${String(key)}`}`); return this; }
-    groupConcat(key, param) {
-        this._columns.push(`GROUP_CONCAT(
-            ${param && param.distinct ? 'DISTINCT' : ''} ${String(key)}
-            ${param && param.asc && param.asc.length > 0 ? `ORDER BY ${param.asc.map(i => `${String(i)} ASC`)} ` : ''}
-            ${param && param.desc && param.desc.length > 0 ? `${param && param.asc && param.asc.length > 0 ? '' : 'ORDER BY'} ${param.desc.map(i => `${String(i)} DESC`)} ` : ''}
-            SEPARATOR '${param && param.separator || ','}'
-            ) ${param && param.groupName || `${String(key)}`}`);
-        return this;
-    }
-    selectColumn(...key) { this._columns.push(...(key.map(k => k))); return this; }
-    updateColumn(key, value) { this._updates ?? (this._updates = {}); this._updates[key] = value; return this; }
-    updateT(t) { this._updates ?? (this._updates = {}); Object.assign(this._updates, t); return this; }
-    replace(key, valueToFind, valueToReplace) {
-        const [pkey1, pkey2] = [`p${this._prefix}${this._index++}`, `p${this._prefix}${this._index++}`];
-        this._updateColumns.push(` ${String(key)} = REPLACE(${String(key)}, :${pkey1}, :${pkey2}) `);
-        this._param[pkey1] = valueToFind;
-        this._param[pkey2] = valueToReplace;
-        return this;
-    }
-}
+], StreamQuery.prototype, "or", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
-], StreamBuild.prototype, "groupBy", null);
+], StreamQuery.prototype, "groupBy", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "groupBy2", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
-], StreamBuild.prototype, "asc", null);
+], StreamQuery.prototype, "asc", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "asc2", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
-], StreamBuild.prototype, "desc", null);
+], StreamQuery.prototype, "desc", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "desc2", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Number, Number]),
     __metadata("design:returntype", void 0)
-], StreamBuild.prototype, "limit", null);
+], StreamQuery.prototype, "limit", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Number, Number]),
     __metadata("design:returntype", void 0)
-], StreamBuild.prototype, "page", null);
+], StreamQuery.prototype, "page", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", void 0)
-], StreamBuild.prototype, "table", null);
+], StreamQuery.prototype, "table", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
-], StreamBuild.prototype, "distinct", null);
+], StreamQuery.prototype, "distinct", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, String, Boolean]),
+    __metadata("design:paramtypes", [Object, String]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "countDistinct", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", void 0)
-], StreamBuild.prototype, "count", null);
+], StreamQuery.prototype, "count", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, String, Boolean]),
     __metadata("design:returntype", void 0)
-], StreamBuild.prototype, "sum", null);
+], StreamQuery.prototype, "sum", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, String, Boolean]),
     __metadata("design:returntype", void 0)
-], StreamBuild.prototype, "avg", null);
+], StreamQuery.prototype, "avg", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, String, Boolean]),
     __metadata("design:returntype", void 0)
-], StreamBuild.prototype, "max", null);
+], StreamQuery.prototype, "max", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, String, Boolean]),
     __metadata("design:returntype", void 0)
-], StreamBuild.prototype, "min", null);
+], StreamQuery.prototype, "min", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Object)
-], StreamBuild.prototype, "groupConcat", null);
+], StreamQuery.prototype, "groupConcat", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
-], StreamBuild.prototype, "selectColumn", null);
+], StreamQuery.prototype, "select", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "select2", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamBuild.prototype, "updateColumn", null);
+], StreamQuery.prototype, "update", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "update2", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
-], StreamBuild.prototype, "updateT", null);
+], StreamQuery.prototype, "updateT", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", void 0)
-], StreamBuild.prototype, "replace", null);
-class StreamQuery extends StreamBuild {
-    constructor(table, service) {
-        super(table);
-        this._service = service;
-    }
-    select(option) {
-        option.sync ?? (option.sync = SyncMode.Async);
-        const { where, params } = this.where();
-        const sql = `
-            SELECT
-            ${this._columns && this._columns.length > 0 ? this._columns.join(',') : '*'}
-            FROM ${this._table}
-            ${where ? ' WHERE ' : ''}
-            ${where}`;
-        if (option.sync === SyncMode.Async) {
-            switch (option.selectResult) {
-                case SelectResult.Many_Row_Many_Column: return this._service.select({ sync: SyncMode.Async, selectResult: SelectResult.Many_Row_Many_Column, errorMsg: option.errorMsg, sql, params });
-                case SelectResult.Many_Row_One_Column: return this._service.select({ sync: SyncMode.Async, selectResult: SelectResult.Many_Row_One_Column, errorMsg: option.errorMsg, sql, params });
-                case SelectResult.One_Row_Many_Column_Assert: return this._service.select({ sync: SyncMode.Async, selectResult: SelectResult.One_Row_Many_Column_Assert, errorMsg: option.errorMsg, sql, params });
-                case SelectResult.One_Row_One_Column_Assert: return this._service.select({ sync: SyncMode.Async, selectResult: SelectResult.One_Row_One_Column_Assert, errorMsg: option.errorMsg, sql, params });
-                case SelectResult.One_Row_Many_Column_NotSure: return this._service.select({ sync: SyncMode.Async, selectResult: SelectResult.One_Row_Many_Column_NotSure, errorMsg: option.errorMsg, sql, params });
-                case SelectResult.One_Row_One_Column_NotSure: return this._service.select({ sync: SyncMode.Async, selectResult: SelectResult.One_Row_One_Column_NotSure, errorMsg: option.errorMsg, sql, params });
-            }
-        }
-        else {
-            switch (option.selectResult) {
-                case SelectResult.Many_Row_Many_Column: return this._service.select({ sync: SyncMode.Sync, selectResult: SelectResult.Many_Row_Many_Column, errorMsg: option.errorMsg, sql, params });
-                case SelectResult.Many_Row_One_Column: return this._service.select({ sync: SyncMode.Sync, selectResult: SelectResult.Many_Row_One_Column, errorMsg: option.errorMsg, sql, params });
-                case SelectResult.One_Row_Many_Column_Assert: return this._service.select({ sync: SyncMode.Sync, selectResult: SelectResult.One_Row_Many_Column_Assert, errorMsg: option.errorMsg, sql, params });
-                case SelectResult.One_Row_One_Column_Assert: return this._service.select({ sync: SyncMode.Sync, selectResult: SelectResult.One_Row_One_Column_Assert, errorMsg: option.errorMsg, sql, params });
-                case SelectResult.One_Row_Many_Column_NotSure: return this._service.select({ sync: SyncMode.Sync, selectResult: SelectResult.One_Row_Many_Column_NotSure, errorMsg: option.errorMsg, sql, params });
-                case SelectResult.One_Row_One_Column_NotSure: return this._service.select({ sync: SyncMode.Sync, selectResult: SelectResult.One_Row_One_Column_NotSure, errorMsg: option.errorMsg, sql, params });
-            }
-        }
-    }
-    update(option) {
-        option.sync ?? (option.sync = SyncMode.Async);
-        const { where, params } = this.where();
-        const sets = new Array(...this._updateColumns);
-        if (this._updates) {
-            for (const [K, V] of Object.entries(this._updates)) {
-                const pkey = `p${this._prefix}${this._index++}`;
-                sets.push(` ${K} = :${pkey} `);
-                params[pkey] = V;
-            }
-        }
-        if (sets.length > 0) {
-            const sql = `UPDATE ${this._table} SET ${sets.join(',')} ${where}`;
-            if (option.sync === SyncMode.Async) {
-                return this._service.excute({ sync: SyncMode.Async, sql, params });
-            }
-            else {
-                return this._service.excute({ sync: SyncMode.Sync, sql, params });
-            }
-        }
-        else {
-            return 0;
-        }
-    }
-    delete(option) {
-        option.sync ?? (option.sync = SyncMode.Async);
-        const { where, params } = this.where();
-        const sql = `DELETE FROM ${this._table} ${where}`;
-        if (option.sync === SyncMode.Async) {
-            return this._service.excute({ sync: SyncMode.Async, sql, params });
-        }
-        else {
-            return this._service.excute({ sync: SyncMode.Sync, sql, params });
-        }
-    }
-}
+], StreamQuery.prototype, "replace", null);
 __decorate([
     IF_EXEC(null),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Object)
-], StreamQuery.prototype, "select", null);
+], StreamQuery.prototype, "excuteSelect", null);
+__decorate([
+    IF_EXEC(null),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Object)
+], StreamQuery.prototype, "excutePage", null);
 __decorate([
     IF_EXEC(0),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Object)
-], StreamQuery.prototype, "update", null);
+], StreamQuery.prototype, "excuteUpdate", null);
 __decorate([
     IF_EXEC(0),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Object)
-], StreamQuery.prototype, "delete", null);
+], StreamQuery.prototype, "excuteDelete", null);
 /**
  获取REDIS客户端，
  # [查看库的API](https://github.com/redis/ioredis?tab=readme-ov-file)
  # [REDIS API](http://doc.redisfans.com/)
  REDIS 的API 可以直接用，将方法名转为小写
+ ```
+ // 设置<Redis>来获得代码提示
+ getRedisDB<Redis>('').exists(?)
+ ```
  */
 export function getRedisDB(db) {
     const rd = globalThis[_dao][DBType.Redis][db ?? _primaryDB];
@@ -3648,6 +4438,8 @@ export function MethodCache(config) {
 class MUParser {
     constructor(modelName, file) {
         this.linNumber = 0;
+        this.lastLine = '';
+        this.lastlastLine = '';
         this.status = 0;
         this.lineSeparator = '\n';
         this.modelName = modelName;
@@ -3656,7 +4448,7 @@ class MUParser {
     }
     next() {
         let sqlId = this.readSqlId();
-        if (this.status === MUParser.END || !sqlId) {
+        if (this.status === MUParser.END) {
             return null;
         }
         // 去掉可能的尾部空格
@@ -3671,9 +4463,6 @@ class MUParser {
     skipHeader() {
         while (true) {
             const line = this.nextLine();
-            if (!line) {
-                return;
-            }
             if (this.status === MUParser.END) {
                 return;
             }
@@ -3700,7 +4489,7 @@ class MUParser {
         let findComment = false;
         while (true) {
             let line = this.nextLine();
-            if (this.status === MUParser.END || !line) {
+            if (this.status === MUParser.END) {
                 return;
             }
             line = line.trim();
@@ -3729,28 +4518,18 @@ class MUParser {
     }
     readSql() {
         const list = [];
-        if (this.lastLine) {
-            list.push(this.lastLine);
-            while (true) {
-                const line = this.nextLine();
-                if (line) {
-                    if (this.status === MUParser.END) {
-                        return this.getBuildSql(list);
-                    }
-                    if (line.startsWith('===')) {
-                        // 删除下一个sqlId表示
-                        list.pop();
-                        return this.getBuildSql(list);
-                    }
-                    list.push(line);
-                }
-                else {
-                    return '';
-                }
+        list.push(this.lastLine);
+        while (true) {
+            const line = this.nextLine();
+            if (this.status === MUParser.END) {
+                return this.getBuildSql(list);
             }
-        }
-        else {
-            return '';
+            if (line.startsWith('===')) {
+                // 删除下一个sqlId表示
+                list.pop();
+                return this.getBuildSql(list);
+            }
+            list.push(line);
         }
     }
     getBuildSql(list) {
@@ -3767,126 +4546,3 @@ class MUParser {
     }
 }
 MUParser.END = 1;
-export const Boot = async function (options) {
-    globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
-    if (options.sqlDir) {
-        globalThis[_path] = await import('path');
-        globalThis[_fs] = await import('fs');
-    }
-    logger.level = options.log ?? 'info';
-    globalThis[_sqlCache] = new SqlCache();
-    if (options.sqlMap || options.sqlDir) {
-        await globalThis[_sqlCache].init(options);
-    }
-    globalThis[_dao] = {
-        [DBType.Mongo]: {},
-        [DBType.Mysql]: {},
-        [DBType.Sqlite]: {},
-        [DBType.SqliteRemote]: {},
-        [DBType.Redis]: {}
-    };
-    if (options.Mysql) {
-        const { createPool } = await import('mysql2/promise');
-        if (options.Mysql['host']) {
-            globalThis[_dao][DBType.Mysql][_primaryDB] = new Mysql(createPool({
-                ...options.Mysql,
-                multipleStatements: true,
-                decimalNumbers: true,
-                supportBigNumbers: true
-            }));
-        }
-        else {
-            let flag = false;
-            for (const [key, option] of Object.entries(options.Mysql)) {
-                const db = new Mysql(createPool({
-                    ...option,
-                    multipleStatements: true,
-                    decimalNumbers: true,
-                    supportBigNumbers: true
-                }));
-                if (flag === false) {
-                    globalThis[_dao][DBType.Mysql][_primaryDB] = db;
-                    flag = true;
-                }
-                globalThis[_dao][DBType.Mysql][key] = db;
-            }
-        }
-    }
-    if (options.Sqlite) {
-        const BetterSqlite3 = await import('better-sqlite3');
-        if (typeof options.Sqlite === 'string') {
-            globalThis[_dao][DBType.Sqlite][_primaryDB] = new Sqlite(new BetterSqlite3.default(options.Sqlite, { fileMustExist: false }));
-        }
-        else {
-            let flag = false;
-            for (const [key, fileName] of Object.entries(options.Sqlite)) {
-                const db = new Sqlite(new BetterSqlite3.default(fileName, { fileMustExist: false }));
-                if (flag === false) {
-                    globalThis[_dao][DBType.Sqlite][_primaryDB] = db;
-                    flag = true;
-                }
-                globalThis[_dao][DBType.Sqlite][key] = db;
-            }
-        }
-    }
-    if (options.SqliteRemote) {
-        if (typeof options.SqliteRemote.db === 'string') {
-            await options.SqliteRemote.service.initDB(options.SqliteRemote.db);
-            globalThis[_dao][DBType.SqliteRemote][_primaryDB] = new SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);
-        }
-        else {
-            let flag = false;
-            for (const [key, fileName] of Object.entries(options.SqliteRemote.db)) {
-                await options.SqliteRemote.service.initDB(fileName);
-                const db = new SqliteRemote(options.SqliteRemote.service, fileName);
-                if (flag === false) {
-                    globalThis[_dao][DBType.SqliteRemote][_primaryDB] = db;
-                    flag = true;
-                }
-                globalThis[_dao][DBType.SqliteRemote][key] = db;
-            }
-        }
-    }
-    if (options.Redis) {
-        const { Redis } = await import('ioredis');
-        if (options.Redis['host']) {
-            globalThis[_dao][DBType.Redis][_primaryDB] = new Redis(options.Redis);
-        }
-        else {
-            let flag = false;
-            for (const [key, option] of Object.entries(options.Redis)) {
-                const db = new Redis(option);
-                if (flag === false) {
-                    globalThis[_dao][DBType.Redis][_primaryDB] = db;
-                    flag = true;
-                }
-                globalThis[_dao][DBType.Redis][key] = db;
-            }
-        }
-        const clients = Object.values(globalThis[_dao][DBType.Redis]);
-        const Redlock = await import('redlock');
-        globalThis[_dao][DBType.RedisLock] = new Redlock.default(clients, {
-            // The expected clock drift; for more details see:
-            // http://redis.io/topics/distlock
-            driftFactor: 0.01, // multiplied by lock ttl to determine drift time
-            // The max number of times Redlock will attempt to lock a resource
-            // before erroring.
-            retryCount: 10,
-            // the time in ms between attempts
-            retryDelay: 200, // time in ms
-            // the max time in ms randomly added to retries
-            // to improve performance under high contention
-            // see https://www.awsarchitectureblog.com/2015/03/backoff.html
-            retryJitter: 200, // time in ms
-            // The minimum remaining time on a lock before an extension is automatically
-            // attempted with the `using` API.
-            automaticExtensionThreshold: 500, // time in ms
-        });
-        const { EventEmitter } = await import('events');
-        const event = new EventEmitter({ captureRejections: true });
-        event.on('error', error => {
-            logger.error('event-bus', error);
-        });
-        globalThis[_EventBus] = event;
-    }
-};