baja-lite 1.0.7 → 1.0.16

package/src/sql.ts

@@ -5,14 +5,42 @@ import iterare from 'iterare';
 import { emptyString } from './string';
 import pino from 'pino';
 import { excuteSplit, ExcuteSplitMode, sleep } from './fn';
-import { add, calc } from './math';
+import { add, calc, ten2Any } from './math';
 import mustache, { PartialsOrLookupFn } from 'mustache';
 import { C2P, C2P2, P2C } from './object';
-import { format } from 'sql-formatter';
+import { formatDialect, sqlite, mysql, DialectOptions } from 'sql-formatter';
 import HTML from 'html-parse-stringify';
 import { XML, convert } from './convert-xml';
 import { ArrayList } from './list';
 import LGet from 'lodash.get';
+import { EnumMap } from 'enum';
+import { encode, decode, ExtensionCodec, DecodeError } from "@msgpack/msgpack";
+(BigInt.prototype as any).toJSON = function () { return this.toString() }
+
+const BIGINT_EXT_TYPE = 0;
+export const extensionCodec = new ExtensionCodec();
+extensionCodec.register({
+    type: BIGINT_EXT_TYPE,
+    encode(input: unknown): Uint8Array | null {
+        if (typeof input === "bigint") {
+            if (input <= Number.MAX_SAFE_INTEGER && input >= Number.MIN_SAFE_INTEGER) {
+                return encode(Number(input));
+            } else {
+                return encode(String(input));
+            }
+        } else {
+            return null;
+        }
+    },
+    decode(data: Uint8Array): bigint {
+        const val = decode(data);
+        if (!(typeof val === "string" || typeof val === "number")) {
+            throw new DecodeError(`unexpected BigInt source: ${val} (${typeof val})`);
+        }
+        return BigInt(val);
+    },
+});
+
 
 // #region 常量
 const _daoDBName = Symbol('dbName');
@@ -21,6 +49,7 @@ const _className = Symbol('className');
 const _ClassName = Symbol('ClassName');
 const _vueName = Symbol('vueName');
 const _ids = Symbol('ids');
+const _logicIds = Symbol('logicIds');
 const _columns = Symbol('columns');
 const _columnsNoId = Symbol('columnsNoId');
 const _fields = Symbol('fields');
@@ -29,10 +58,12 @@ const _deleteState = Symbol('deleteState');
 const _transformer = Symbol('transformer');
 const _index = Symbol('index');
 const _def = Symbol('def');
+const _comment = Symbol('comment');
 export const _sqlCache = Symbol('sqlMap');
 export const _dao = Symbol('dao');
 export const _primaryDB = Symbol('primaryDB');
 const _dbType = Symbol('dbType');
+const _formatDialect = Symbol('FormatDialect');
 const _sqlite_version = Symbol('sqlite_version');
 const _daoConnection = Symbol('daoConnection');
 const _inTransaction = Symbol('inTransaction');
@@ -41,6 +72,7 @@ const _sqliteRemoteName = Symbol('sqliteRemoteName');
 const _SqlOption = Symbol('SqlOption');
 const _resultMap = Symbol('resultMap');
 const _resultMap_SQLID = Symbol('resultMap_SQLID');
+export const _enums = Symbol('_enums');
 export const _Hump = Symbol('Hump');
 export const _GlobalSqlOption = Symbol('GlobalSqlOption');
 export const _EventBus = Symbol('EventBus');
@@ -248,6 +280,8 @@ interface ServiceOption {
     dbType?: DBType;
     /** SQLite版本以及升级为该版本时需要执行的SQL,初始版本为0.0.1,切记每个位置不要变为两位数*/
     sqliteVersion?: string;
+    /** 备注 */
+    comment?: string;
 }
 /**
  # 全局行为配置文件
@@ -309,6 +343,23 @@ export interface GlobalSqlOptionForWeb {
     ]
      */
     sqlMapperMap?: SqlMappers;
+    /** 提供的枚举MAP */
+    enums?: EnumMap;
+    /**
+     * `列名与属性映射` 是否自动将下划线转为驼峰，默认NONE，即不转.
+     * 当设置为columnMode.HUMP时，切记将代码生成器中属性名称改对
+     * # 自定义sql查询时，无法自动转换哦,可使用标签转换：
+     *```
+        SELECT
+     *  {{#hump}} seller_sku2, seller_sku {{/hump}}
+     * ```
+     * 转换为
+     *```
+        SELECT
+     *  {{#hump}} seller_sku2 sellerSku2, seller_sku sellerSku {{/hump}}
+     * ```
+     */
+    columnMode?: ColumnMode;
 }
 /**
  # 全局行为配置文件
@@ -370,12 +421,13 @@ export interface GlobalSqlOption extends GlobalSqlOptionForWeb {
        export default {
             'sql_1': 'SELECT * FROM user WHERE username = :username',
             'sql_2': (options: {
-                ctx: any;
+                ctx?: any;
                 isCount?: boolean;
+                isSum?: boolean;
                 limitStart?: number;
                 limitEnd?: number;
                 orderBy?: string;
-                [k: string]: any;
+                params?: Record<string, any>;
             }) => {
                 return   `
                     SELECT * FROM user u LEFT JOIN organ o ON u.orgid = o.orgid
@@ -442,21 +494,7 @@ export interface GlobalSqlOption extends GlobalSqlOptionForWeb {
      */
     Redis?: Record<string, Record<string, any>> | Record<string, any>;
 
-    /**
-     * `列名与属性映射` 是否自动将下划线转为驼峰，默认NONE，即不转.
-     * 当设置为columnMode.HUMP时，切记将代码生成器中属性名称改对
-     * # 自定义sql查询时，无法自动转换哦,可使用标签转换：
-     *```
-        SELECT
-     *  {{#hump}} seller_sku2, seller_sku {{/hump}}
-     * ```
-     * 转换为
-     *```
-        SELECT
-     *  {{#hump}} seller_sku2 sellerSku2, seller_sku sellerSku {{/hump}}
-     * ```
-     */
-    columnMode?: ColumnMode;
+
     /**
      * 读取查询语句时，是否扫描JS文件？
      * JS文件需要默认导出一个 SqlModel对象
@@ -474,9 +512,16 @@ interface FieldOption extends Object {
     index?: boolean;
     id?: boolean;
     logicDelete?: string | number;
+    /** 是否逻辑唯一，用于导入时检测数据是否存在 */
+    logicId?: boolean;
     /** 仅在生成 表时有效 */
     notNull?: boolean;
+    /** 注释，影响到默认导出导入标题 */
     comment?: string;
+    /** 可以导入的字段,默认TRUE,ID默认FALSE */
+    importable?: boolean;
+    /** 可以导出的字段,默认TRUE,ID默认FALSE */
+    exportable?: boolean;
     /** sqlite 无效,与UUID只能有一个 */
     uuidShort?: boolean;
     /** 与uuidShort只能有一个 */
@@ -493,6 +538,7 @@ interface AField extends FieldOption {
     [DBType.Mysql]: () => string;
     [DBType.Sqlite]: () => string;
     [DBType.SqliteRemote]: () => string;
+    Data2SQL: (data: any) => any;
 }
 export interface PageQuery<L> {
     sum?: Record<string, number>;
@@ -505,12 +551,11 @@ export interface PageQuery<L> {
 // #region 数据方言
 /** sqlite electron服务端需要支持的接口 */
 export interface SqliteRemoteInterface {
-    execute(dbName: string, sql?: string, params?: any): | Promise<{ affectedRows: number; insertId: bigint; }>
-    pluck<One_Row_Many_Column = any>(dbName: string, sql?: string, params?: any): Promise<One_Row_Many_Column | null>;
-    get<One_Row_Many_Column = any>(dbName: string, sql?: string, params?: any): Promise<One_Row_Many_Column | null>;
-    raw<Many_Row_One_Column = any>(dbName: string, sql?: string, params?: any): Promise<Many_Row_One_Column[]>;
-    query<Many_Row_Many_Column = any>(dbName: string, sql?: string, params?: any): Promise<Many_Row_Many_Column[]>;
-
+    execute(inData: Uint8Array): | Promise<Uint8Array>
+    pluck(inData: Uint8Array): Promise<Uint8Array>;
+    get(inData: Uint8Array): Promise<Uint8Array>;
+    raw(inData: Uint8Array): Promise<Uint8Array>;
+    query(inData: Uint8Array): Promise<Uint8Array>;
     initDB(dbName: string): Promise<void>;
     export(dbName: string): Promise<void>;
     restore(dbName: string, fromName: string): Promise<void>;
@@ -1059,7 +1104,8 @@ export class SqliteRemoteConnection implements Connection {
         }
         return new Promise<{ affectedRows: number; insertId: bigint; }>(async (resolve, reject) => {
             try {
-                const { affectedRows, insertId } = await this[_daoConnection].execute(this[_sqliteRemoteName], sql, params);
+                const data = await this[_daoConnection].execute(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
+                const { affectedRows, insertId } = decode(data, { extensionCodec }) as { affectedRows: number; insertId: bigint; };
                 resolve({ affectedRows, insertId: insertId ? BigInt(insertId) : 0n });
             } catch (error) {
                 logger.error(`
@@ -1086,7 +1132,8 @@ export class SqliteRemoteConnection implements Connection {
         }
         return new Promise<T | null>(async (resolve, reject) => {
             try {
-                const r = await this[_daoConnection].pluck(this[_sqliteRemoteName], sql, params);
+                const data = await this[_daoConnection].pluck(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
+                const r = decode(data, { extensionCodec }) as T;
                 resolve(r);
             } catch (error) {
                 logger.error(`
@@ -1113,7 +1160,8 @@ export class SqliteRemoteConnection implements Connection {
         }
         return new Promise<T | null>(async (resolve, reject) => {
             try {
-                const r = await this[_daoConnection].get(this[_sqliteRemoteName], sql, params);
+                const data = await this[_daoConnection].get(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
+                const r = decode(data, { extensionCodec }) as T;
                 resolve(r);
             } catch (error) {
                 logger.error(`
@@ -1140,7 +1188,8 @@ export class SqliteRemoteConnection implements Connection {
         }
         return new Promise<T[]>(async (resolve, reject) => {
             try {
-                const r = await this[_daoConnection].raw(this[_sqliteRemoteName], sql, params);
+                const data = await this[_daoConnection].raw(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
+                const r = decode(data, { extensionCodec }) as T[];
                 resolve(r);
             } catch (error) {
                 logger.error(`
@@ -1167,7 +1216,8 @@ export class SqliteRemoteConnection implements Connection {
         }
         return new Promise<T[]>(async (resolve, reject) => {
             try {
-                const r = await this[_daoConnection].query(this[_sqliteRemoteName], sql, params);
+                const data = await this[_daoConnection].query(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
+                const r = decode(data, { extensionCodec }) as T[];
                 resolve(r);
             } catch (error) {
                 logger.error(`
@@ -1188,6 +1238,7 @@ export class SqliteRemoteConnection implements Connection {
 export class SqliteRemote implements Dao {
     [_sqliteRemoteName]: string;
     [_daoDB]: SqliteRemoteInterface;
+    private connection?: SqliteRemoteConnection;
 
     constructor(db: SqliteRemoteInterface, name: string) {
         this[_daoDB] = db;
@@ -1203,8 +1254,11 @@ export class SqliteRemote implements Dao {
             return null;
         };
         return new Promise<Connection>(async (resolve, reject) => {
+            if (!this.connection) {
+                this.connection = new SqliteRemoteConnection(this[_daoDB], this[_sqliteRemoteName]);
+            }
             try {
-                resolve(new SqliteRemoteConnection(this[_daoDB], this[_sqliteRemoteName]));
+                resolve(this.connection);
             } catch (error) {
                 reject(error);
             }
@@ -1282,24 +1336,24 @@ export type SqlMapper = ([string, string[], any?])[];
 export type SqlMappers = Record<string, SqlMapper>;
 export type SqlModel = Record<string, string | (
     (options: {
-        ctx: any;
+        ctx?: any;
         isCount?: boolean;
         isSum?: boolean;
         limitStart?: number;
         limitEnd?: number;
         orderBy?: string;
-        [k: string]: any;
+        params?: any;
     }) => string
 )>;
 type _SqlModel = Record<string, string | (
     (options: {
-        ctx: any;
+        ctx?: any;
         isCount?: boolean;
         isSum?: boolean;
         limitStart?: number;
         limitEnd?: number;
         orderBy?: string;
-        [k: string]: any;
+        params?: any;
     }) => string
 ) | XML[]>;
 class Build {
@@ -1563,6 +1617,31 @@ class Build {
             }
         };
     }
+    /**
+     * * PROBLEM_TYPE = 枚举名
+     * * t.problemtype = 列名
+     *
+     * ```
+     * {{#enumTag}} PROBLEM_TYPE(t.problemtype) {{/enumTag}}
+     * ```
+     */
+    enum() {
+        return (text: string) => {
+            const matchs = text.match(/([a-zA-Z_]+)\(([^()]+)\)/);
+            if (matchs) {
+                const [_a, MapName, Column] = matchs;
+                if (MapName && Column) {
+                    const map = globalThis[_enums].GlobalMap[MapName.trim()];
+                    if (map) {
+                        return ` CASE
+    ${Object.entries(map).map(([k, v]) => `WHEN ${Column} = '${k}' THEN '${v}'`).join(' ')}
+    END `;
+                    }
+                }
+            }
+            return "''";
+        };
+    }
 }
 
 function replaceCdata(rawText: string) {
@@ -1767,7 +1846,7 @@ export class SqlCache {
         }
     }
     load(sqlids: string[], options: {
-        ctx: any;
+        ctx?: any;
         isCount?: boolean;
         isSum?: boolean;
         limitStart?: number;
@@ -1787,17 +1866,12 @@ export class SqlCache {
         const buildParam = new Build(options.isCount === true, options.isSum === true, options);
         if (typeof sqlSource === 'function') {
             const _sql = sqlSource(options);
-            const sql = mustache.render(_sql, buildParam, this.sqlFNMap);
-            return format(sql);
+            return mustache.render(_sql, buildParam, this.sqlFNMap);
         } else if (typeof sqlSource === 'string') {
-            const sql = mustache.render(sqlSource, buildParam, this.sqlFNMap);
-            return format(sql);
+            return mustache.render(sqlSource, buildParam, this.sqlFNMap);
         } else if (typeof sqlSource === 'object') {
             const _sql = convert(sqlSource, options, matchSqlid, this.sqlMap as Record<string, XML[]>);
-            console.log(_sql);
-            const sql = mustache.render(_sql, buildParam, this.sqlFNMap);
-            console.log(sql);
-            return format(sql);
+            return mustache.render(_sql, buildParam, this.sqlFNMap);
         }
         return '';
     }
@@ -1829,12 +1903,9 @@ function P<T extends object>(skipConn = false) {
             const option = args[0] = Object.assign({}, globalThis[_GlobalSqlOption], this[_SqlOption], args[0]) as (MethodOption & { sync?: SyncMode; });
             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] as Dao;
             Throw.if(!option!.dao, `not found db:${String(dbName)}(${this[_dbType]})`);
             option!.tableName = option?.tableName ?? this[_tableName];
-            const tableES = Sqlstring.escapeId(option!.tableName);
             if (this[_dbType] === DBType.Sqlite) {
                 Throw.if(option.sync === SyncMode.Async, 'sqlite can not Async!')
                 // 连接共享
@@ -1843,59 +1914,6 @@ function P<T extends object>(skipConn = false) {
                 } else {
                     needRealseConn = false;
                 }
-                if (skipConn === false) {
-                    const lastVersion = this[_sqlite_version] ?? '0.0.1';
-                    // 检查表
-                    const tableCheckResult = option!.conn!.pluck<number>(SyncMode.Sync, `SELECT COUNT(1) t FROM sqlite_master WHERE TYPE = 'table' AND name = ?`, [option!.tableName]);
-                    if (tableCheckResult) {
-                        // 旧版本
-                        const tableVersion = option!.conn!.pluck<string>(SyncMode.Sync, 'SELECT ______version v from TABLE_VERSION WHERE ______tableName = ?', [option!.tableName]);
-                        if (tableVersion && tableVersion < lastVersion) { // 发现需要升级的版本
-                            // 更新版本
-                            const columns = iterare<{ name: string }>(option!.conn!.query(SyncMode.Sync, `PRAGMA table_info(${tableES})`))
-                                .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(/\./, '_')}`);
-                            option!.conn!.execute(SyncMode.Sync, `DROP TABLE IF EXISTS ${rtable};`);
-                            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]?.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} ("${this[_fields]![index]?.C2()}");`);
-                                }
-                            }
-                            option!.conn!.execute(SyncMode.Sync, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
-                            option!.conn!.execute(SyncMode.Sync, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
-                            option!.conn!.execute(SyncMode.Sync, `DROP TABLE IF EXISTS ${rtable};`);
-                            // 更新完毕，保存版本号
-                            option!.conn!.execute(SyncMode.Sync, 'UPDATE TABLE_VERSION SET ______version = ? WHERE ______tableName = ?', [option!.tableName, lastVersion]);
-                        } else if (!tableVersion) { // 不需要升级情况：没有旧的版本号
-                            option!.conn!.execute(SyncMode.Sync, 'INSERT INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option!.tableName, lastVersion]);
-                        }
-                    } else { // 表不存在
-                        // 创建表
-                        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]?.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} ("${this[_fields]![index]?.C2()}");`);
-                            }
-                        }
-                        option!.conn!.execute(SyncMode.Sync, 'INSERT OR REPLACE INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option!.tableName, lastVersion]);
-                    }
-                }
                 try {
                     const result = fn.call(this, ...args);
                     logger.info(`${propertyKey}:${option!.tableName}:use ${+new Date() - startTime}ms`);
@@ -1924,58 +1942,6 @@ function P<T extends object>(skipConn = false) {
                     } else {
                         needRealseConn = false;
                     }
-                    if (skipConn === false) {
-                        const lastVersion = this[_sqlite_version] ?? '0.0.1';
-                        // 检查表
-                        const tableCheckResult = await option!.conn!.pluck<number>(SyncMode.Async, `SELECT COUNT(1) t FROM sqlite_master WHERE TYPE = 'table' AND name = ?`, [option!.tableName]);
-                        if (tableCheckResult) {
-                            // 旧版本
-                            const tableVersion = await option!.conn!.pluck<string>(SyncMode.Async, 'SELECT ______version v from TABLE_VERSION WHERE ______tableName = ?', [option!.tableName]);
-                            if (tableVersion && tableVersion < lastVersion) { // 发现需要升级的版本
-                                // 更新版本
-                                const columns = iterare<{ name: string }>(await option!.conn!.query(SyncMode.Async, `PRAGMA table_info(${tableES})`))
-                                    .filter(c => this[_fields]!.hasOwnProperty(C2P(c.name, globalThis[_Hump])))
-                                    .map(c => Sqlstring.escapeId(c.name))
-                                    .join(',');
-
-                                const rtable = `${option!.tableName}_${tableVersion.replace(/\./, '_')}`;
-                                await option!.conn!.execute(SyncMode.Async, `DROP TABLE IF EXISTS ${rtable};`);
-                                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]?.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} ("${this[_fields]![index]?.C2()}");`);
-                                    }
-                                }
-                                await option!.conn!.execute(SyncMode.Async, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
-                                await option!.conn!.execute(SyncMode.Async, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
-                                await option!.conn!.execute(SyncMode.Async, `DROP TABLE IF EXISTS ${rtable};`);
-                                // 更新完毕，保存版本号
-                                await option!.conn!.execute(SyncMode.Async, 'UPDATE TABLE_VERSION SET ______version = ? WHERE ______tableName = ?', [option!.tableName, lastVersion]);
-                            } else if (!tableVersion) { // 不需要升级情况：没有旧的版本号
-                                await option!.conn!.execute(SyncMode.Async, 'INSERT INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option!.tableName, lastVersion]);
-                            }
-                        } else { // 表不存在
-                            // 创建表
-                            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]?.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)} ("${this[_fields]![index]?.C2()}");`);
-                                }
-                            }
-                            await option!.conn!.execute(SyncMode.Async, 'INSERT OR REPLACE INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option!.tableName, lastVersion]);
-                        }
-                    }
                     try {
                         const result = await fn.call(this, ...args);
                         logger.info(`${propertyKey}:${option!.tableName}:use ${+new Date() - startTime}ms`);
@@ -2099,6 +2065,7 @@ export const Field = (config: FieldOption) => {
             case SqlType.bigint: {
                 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`;
+                field.Data2SQL = (data: any) => BigInt(data ?? 0);
                 break;
             }
             case SqlType.float: {
@@ -2135,26 +2102,31 @@ export const Field = (config: FieldOption) => {
             case SqlType.date: {
                 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`;
+                field.Data2SQL = (data: any) => typeof data === 'string' ? new Date(data) : data;
                 break;
             }
             case SqlType.time: {
                 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`;
+                field.Data2SQL = (data: any) => typeof data === 'string' ? new Date(data) : data;
                 break;
             }
             case SqlType.year: {
                 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`;
+                field.Data2SQL = (data: any) => typeof data === 'string' ? new Date(data) : data;
                 break;
             }
             case SqlType.datetime: {
                 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`;
+                field.Data2SQL = (data: any) => typeof data === 'string' ? new Date(data) : data;
                 break;
             }
             case SqlType.timestamp: {
                 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`;
+                field.Data2SQL = (data: any) => typeof data === 'string' ? +new Date(data) : data;
                 break;
             }
             case SqlType.char: {
@@ -2269,6 +2241,7 @@ export const Field = (config: FieldOption) => {
         let __columns = Reflect.getMetadata(_columns, object);
         let __columnsNoId = Reflect.getMetadata(_columnsNoId, object);
         let __ids = Reflect.getMetadata(_ids, object);
+        let __logicIds = Reflect.getMetadata(_logicIds, object);
         let __index = Reflect.getMetadata(_index, object);
         let __def = Reflect.getMetadata(_def, object);
 
@@ -2287,16 +2260,23 @@ export const Field = (config: FieldOption) => {
         } else {
             __columnsNoId.push(propertyName);
         }
+        if (field.logicId === true) {
+            __logicIds.push(propertyName);
+        }
         if (field.index === true) {
             __index.push(propertyName);
         }
         if (hasDef) {
             __def[propertyName] = field.def;
         }
+        if (field.comment) {
+            __def[propertyName] = field.comment;
+        }
         Reflect.defineMetadata(_fields, __fields, object);
         Reflect.defineMetadata(_columns, __columns, object);
         Reflect.defineMetadata(_columnsNoId, __columnsNoId, object);
         Reflect.defineMetadata(_ids, __ids, object);
+        Reflect.defineMetadata(_logicIds, __logicIds, object);
         Reflect.defineMetadata(_index, __index, object);
         Reflect.defineMetadata(_def, __def, object);
         if (field.hasOwnProperty('logicDelete')) {
@@ -2305,16 +2285,24 @@ export const Field = (config: FieldOption) => {
         }
     };
 }
+const formatDialects = {
+    [DBType.Mysql]: mysql,
+    [DBType.Sqlite]: sqlite,
+    [DBType.SqliteRemote]: sqlite
+};
 export const DB = (config: ServiceOption) => {
     return function <C extends { new(...args: any[]): {} }>(constructor: C) {
         const __ids = Reflect.getMetadata(_ids, config.clz.prototype) || new Array<string>;
+        const __logicIds = Reflect.getMetadata(_logicIds, config.clz.prototype) || new Array<string>;
         const __fields = Reflect.getMetadata(_fields, config.clz.prototype);
         const __columns = Reflect.getMetadata(_columns, config.clz.prototype);
-        const __columnsNoId = __columns.filter((c: string) => __ids.includes(c) === false);
+        const __columnsNoId = Reflect.getMetadata(_columnsNoId, config.clz.prototype);
         const __stateFileName = Reflect.getMetadata(_stateFileName, config.clz.prototype);
         const __deleteState = Reflect.getMetadata(_deleteState, config.clz.prototype);
         const __index = Reflect.getMetadata(_index, config.clz.prototype);
         const __def = Reflect.getMetadata(_def, config.clz.prototype);
+        const __dbType = config.dbType ?? DBType.Mysql;
+        const __formatDialect = formatDialects[__dbType];
         const className = config.tableName?.replace(/_(\w)/g, (a: string, b: string) => b.toUpperCase());
         const ClassName = className?.replace(/\w/, (v: string) => v.toUpperCase());
         const vueName = config.tableName?.replace(/_/g, '-');
@@ -2323,17 +2311,21 @@ export const DB = (config: ServiceOption) => {
             [_className] = className;
             [_ClassName] = ClassName;
             [_vueName] = vueName;
+
             [_daoDBName] = config.dbName;
-            [_dbType] = config.dbType ?? DBType.Mysql;
+            [_dbType] = __dbType;
+            [_formatDialect] = __formatDialect;
             [_sqlite_version] = config.sqliteVersion;
             [_SqlOption] = Object.assign({}, _defOption, config);
 
             [_ids] = __ids;
+            [_logicIds] = __logicIds;
             [_fields] = __fields;
             [_columns] = __columns;
             [_columnsNoId] = __columnsNoId;
             [_index] = __index;
             [_def] = __def;
+            [_comment] = config.comment;
             [_stateFileName] = __stateFileName;
             [_deleteState] = __deleteState;
 
@@ -2355,6 +2347,9 @@ export const DB = (config: ServiceOption) => {
                         .map(K => [K, FieldFilter(K as string, data[K as string], __def, __fields[K as string].uuid === true || __fields[K as string].uuidShort === true, option)])
                         .filter(data => {
                             if ((data[1] as any)[0] === 1) {
+                                if (__fields[data[0] as string].Data2SQL) {
+                                    (data[1] as any)[1] = __fields[data[0] as string].Data2SQL((data[1] as any)[1]);
+                                }
                                 if (option?.onFieldExists) {
                                     option.onFieldExists(data[0] as string, (data[1] as any)[1]);
                                 }
@@ -2418,7 +2413,9 @@ export class SqlService<T extends object> {
     private [_ClassName]?: string;
     private [_vueName]?: string;
     private [_daoDBName]?: string;
+    private [_comment]?: string;
     private [_ids]?: string[];
+    // private [_logicIds]?: string[];
     private [_fields]?: Record<string, AField>;
     private [_columns]?: string[];
     private [_columnsNoId]?: string[];
@@ -2426,6 +2423,7 @@ export class SqlService<T extends object> {
     private [_deleteState]?: string;
     private [_SqlOption]?: ServiceOption;
     private [_dbType]?: DBType;
+    private [_formatDialect]?: DialectOptions;
     private [_sqlite_version]?: string;
     private [_index]?: string[];
     private [_def]?: Partial<T>;
@@ -2445,6 +2443,7 @@ export class SqlService<T extends object> {
             existConditionOtherThanIds?: (keyof T)[];
             replaceWithDef?: boolean;
         }): { sql: string; params?: any[] }[] {
+
         const sqls: { sql: string; params?: any[] }[] = [];
         const tableName = Sqlstring.escapeId(option!.tableName);
         switch (option?.mode) {
@@ -2493,10 +2492,10 @@ export class SqlService<T extends object> {
                         return `SELECT ${questMark.join(',')} FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM ${tableName} WHERE ${where})`;
                     });
                 const columnNames = iterare<string>(finalColumns).map(i => this[_fields]![i]?.C2()).join(',');
-                const sql = format(`INSERT INTO
+                const sql = formatDialect(`INSERT INTO
                 ${tableName}
                 (${columnNames})
-                ${questMarks.join(' UNION ALL ')};`);
+                ${questMarks.join(' UNION ALL ')};`, { dialect: this[_formatDialect]! });
                 sqls.push({ sql, params });
                 break;
             }
@@ -2531,12 +2530,12 @@ export class SqlService<T extends object> {
                         return `(${questMark.join(',')})`;
                     });
                 const columnNames = iterare(finalColumns).map(i => this[_fields]![i]?.C2()).join(',');
-                const sql = format(`
+                const sql = formatDialect(`
                     ${this[_dbType] === DBType.Mysql ? '' : 'INSERT OR'} REPLACE INTO
                     ${tableName}
                     (${columnNames})
                     VALUES ${questMarks};
-                `);
+                `, { dialect: this[_formatDialect]! });
                 sqls.push({ sql, params });
                 break;
             }
@@ -2571,12 +2570,12 @@ export class SqlService<T extends object> {
                         return `(${questMark.join(',')})`;
                     });
                 const columnNames = iterare(finalColumns).map(i => this[_fields]![i]?.C2()).join(',');
-                const sql = format(`
+                const sql = formatDialect(`
                     INSERT INTO
                     ${tableName}
                     (${columnNames})
                     VALUES ${questMarks};
-                `);
+                `, { dialect: this[_formatDialect]! });
 
                 sqls.push({ sql, params });
                 break;
@@ -2618,16 +2617,16 @@ export class SqlService<T extends object> {
                 sqls.push(..._sqls);
                 const columnNames = iterare(finalColumns).map(i => this[_fields]![i]?.C2()).join(',');
                 sqls.push({
-                    sql: format(`
+                    sql: formatDialect(`
                         INSERT INTO
                         ${tableTemp}
                         (${columnNames})
                         VALUES ${questMarks};
-                    `), params
+                    `, { dialect: this[_formatDialect]! }), params
                 });
                 sqls.push({
-                    sql: format(`INSERT INTO ${Sqlstring.escapeId(option.tableName)} (${columnNames})
-                        SELECT ${columnNames} FROM ${tableTemp};`)
+                    sql: formatDialect(`INSERT INTO ${Sqlstring.escapeId(option.tableName)} (${columnNames})
+                        SELECT ${columnNames} FROM ${tableTemp};`, { dialect: this[_formatDialect]! })
                 });
                 sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
                 break;
@@ -2698,23 +2697,21 @@ export class SqlService<T extends object> {
             }
         } else if (isArray) {
             const fn = async () => {
-                return await option?.dao?.transaction(SyncMode.Async, async () => {
-                    const result = await excuteSplit<Partial<T>, bigint>(
-                        ExcuteSplitMode.AsyncTrust,
-                        datas,
-                        async _data => {
-                            const sqls = this._insert(_data, option);
-                            let result = 0n;
-                            for (const { sql, params } of sqls) {
-                                const dd = await option?.conn!.execute(SyncMode.Async, sql, params);
-                                if (dd.insertId) { result += dd.insertId; }
-                            }
-                            return result;
-                        },
-                        { everyLength: option?.every === true ? 1 : option?.maxDeal }
-                    );
-                    return result;
-                }, option?.conn);
+                const result = await excuteSplit<Partial<T>, bigint>(
+                    ExcuteSplitMode.AsyncTrust,
+                    datas,
+                    async _data => {
+                        const sqls = this._insert(_data, option);
+                        let result = 0n;
+                        for (const { sql, params } of sqls) {
+                            const dd = await option!.conn!.execute(SyncMode.Async, sql, params);
+                            if (dd.insertId) { result += dd.insertId; }
+                        }
+                        return result;
+                    },
+                    { everyLength: option?.every === true ? 1 : option?.maxDeal }
+                );
+                return result;
             };
             return new Promise<bigint[]>(async (resolve, reject) => {
                 try {
@@ -2787,13 +2784,13 @@ export class SqlService<T extends object> {
                 }
             );
         }
-        const sql = format(`UPDATE ${tableName} SET ${iterare(this[_columnsNoId]!)
+        const sql = formatDialect(`UPDATE ${tableName} SET ${iterare(this[_columnsNoId]!)
             .filter(K => columnMaps[K]!.where.length > 0)
             .map(K => {
                 params.push(...columnMaps[K]!.params);
                 return `${this[_fields]![K]?.C2()} = CASE ${columnMaps[K]!.where.join(' ')} ELSE ${this[_fields]![K]?.C2()} END`
             })
-            .join(',')};`);
+            .join(',')};`, { dialect: this[_formatDialect]! });
         sqls.push({ sql, params });
         return sqls;
     }
@@ -2939,13 +2936,13 @@ export class SqlService<T extends object> {
             if (this[_stateFileName] !== undefined && option.forceDelete !== true) {
                 params.unshift(this[_deleteState]);
                 sqls.push({
-                    sql: format(`
+                    sql: formatDialect(`
                     UPDATE ${tableNameESC} SET ${this[_fields]![this[_stateFileName]]?.C2()} = ?
                     WHERE ${whereSql};
-                `), params
+                `, { dialect: this[_formatDialect]! }), params
                 });
             } else {
-                sqls.push({ sql: format(`DELETE FROM ${tableNameESC} WHERE ${whereSql};`), params });
+                sqls.push({ sql: formatDialect(`DELETE FROM ${tableNameESC} WHERE ${whereSql};`, { dialect: this[_formatDialect]! }), params });
             }
         } else {
             sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
@@ -2956,13 +2953,13 @@ export class SqlService<T extends object> {
                 case DBType.Mysql: {
                     if (this[_stateFileName] !== undefined && option.forceDelete !== true) {
                         sqls.push({
-                            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()} = ?;`),
+                            sql: formatDialect(`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()} = ?;`, { dialect: this[_formatDialect]! }),
                             params: [this[_deleteState]]
                         });
                     } else {
                         sqls.push({
-                            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 ')};`)
+                            sql: formatDialect(`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 ')};`, { dialect: this[_formatDialect]! })
                         });
                     }
                     break;
@@ -2972,12 +2969,12 @@ export class SqlService<T extends object> {
                     const columnNames = iterare(delWhere).map(K => this[_fields]![K]?.C2()).join(',');
                     if (this[_stateFileName] !== undefined && option.forceDelete !== true) {
                         sqls.push({
-                            sql: format(`UPDATE ${tableNameESC} SET ${this[_fields]![this[_stateFileName]]?.C2()} = ?
-                            WHERE (${columnNames}) IN (SELECT ${columnNames} FROM ${tableTempESC});`),
+                            sql: formatDialect(`UPDATE ${tableNameESC} SET ${this[_fields]![this[_stateFileName]]?.C2()} = ?
+                            WHERE (${columnNames}) IN (SELECT ${columnNames} FROM ${tableTempESC});`, { dialect: this[_formatDialect]! }),
                             params: [this[_deleteState]]
                         });
                     } else {
-                        sqls.push({ sql: format(`DELETE FROM ${tableNameESC} WHERE (${columnNames}) IN (SELECT ${columnNames} FROM ${tableTempESC});`) });
+                        sqls.push({ sql: formatDialect(`DELETE FROM ${tableNameESC} WHERE (${columnNames}) IN (SELECT ${columnNames} FROM ${tableTempESC});`, { dialect: this[_formatDialect]! }) });
                     }
                     break;
                 }
@@ -3029,8 +3026,7 @@ export class SqlService<T extends object> {
                 return result[0] as T;
             }
             case TemplateResult.NotSureOne: {
-                Throw.if(!result, error);
-                return (result[0] as T) ?? null;
+                return result && result.length > 0 ? (result[0] as T) ?? null : null;
             }
             case TemplateResult.Many: {
                 return result;
@@ -3102,13 +3098,13 @@ export class SqlService<T extends object> {
         let resultIndex = -1;
         if (option.mode === SelectMode.Common) {
             const params = new Array<any>();
-            const whereSql = format(iterare(wheres).map(where => this[_transformer]!(where, option)).map(where => {
+            const whereSql = formatDialect(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 `${this[_fields]![K]?.C2()} = ?`;
                 }).join(' AND ')}`;
-            }).join(' UNION ALL '));
+            }).join(' UNION ALL '), { dialect: this[_formatDialect]! });
             sqls.push({ sql: whereSql, params });
             resultIndex = 0;
         } else {
@@ -3117,7 +3113,7 @@ export class SqlService<T extends object> {
             const _sqls = this._createTable<L>({ tableName: tableTemp, temp: true, columns: delWhere, data: wheres, index: 'all', id: 'none' })!;
             sqls.push(..._sqls);
             resultIndex = sqls.length;
-            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: formatDialect(`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 ')};`, { dialect: this[_formatDialect]! }) });
             sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
         }
 
@@ -3270,7 +3266,7 @@ export class SqlService<T extends object> {
         const _params = Object.assign({}, option.context, option.params);
         option.sql ??= globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: option.isCount, ..._params });
         const params: any[] = [];
-        const sql = option.sql?.replace(/\:([A-Za-z0-9._]+)/g, (txt, key) => {
+        const sql = formatDialect(option.sql?.replace(/\:([A-Za-z0-9._]+)/g, (txt, key) => {
             let V = LGet(_params, key);
             if (V) {
                 if (V !== undefined) {
@@ -3295,7 +3291,7 @@ export class SqlService<T extends object> {
                 return '?';
             }
             return txt;
-        });
+        })!, { dialect: this[_formatDialect]! });
         if (option.sync === SyncMode.Sync) {
             const result = option!.conn!.query(SyncMode.Sync, sql, params);
             return this._select<L>(option.selectResult, result, option.defValue, option.errorMsg, option.hump, option.mapper, option.mapperIfUndefined);
@@ -3334,7 +3330,7 @@ export class SqlService<T extends object> {
         const _params = Object.assign({}, option.context, option.params);
         option.sql ??= globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, ..._params });
         const params: any[] = [];
-        const sql = option.sql?.replace(/\:(\w+)/g, (txt, key) => {
+        const sql = formatDialect(option.sql?.replace(/\:(\w+)/g, (txt, key) => {
             let V = LGet(_params, key);
             if (V) {
                 if (V !== undefined) {
@@ -3359,7 +3355,7 @@ export class SqlService<T extends object> {
                 return '?';
             }
             return txt;
-        });
+        })!, { dialect: this[_formatDialect]! });
         if (option.sync === SyncMode.Sync) {
             const result = option!.conn!.execute(SyncMode.Sync, sql, params);
             return result.affectedRows;
@@ -3414,17 +3410,18 @@ export class SqlService<T extends object> {
         return new StreamQuery<L>(option?.tableName ?? this[_tableName]!, this as any, this[_fields]!, this[_columns]!);
     }
 
-
-    page<L = T>(option: MethodOption & { sync?: SyncMode.Async; sqlId: string; context?: any; params: Record<string, any>; pageSize: number; pageNumber: number; limitSelf?: boolean; countSelf?: boolean; sumSelf?: boolean; orderBy?: string; hump?: boolean; mapper?: string | SqlMapper; mapperIfUndefined?: MapperIfUndefined; }): Promise<PageQuery<L>>;
-    page<L = T>(option: MethodOption & { sync: SyncMode.Sync; sqlId: string; context?: any; params: Record<string, any>; pageSize: number; pageNumber: number; limitSelf?: boolean; countSelf?: boolean; sumSelf?: boolean; orderBy?: string; hump?: boolean; mapper?: string | SqlMapper; mapperIfUndefined?: MapperIfUndefined; }): PageQuery<L>;
+    page<L = T>(option: MethodOption & { sync?: SyncMode.Async; sqlId: string; context?: any; params: Record<string, any>; pageSize?: number; pageNumber?: number; limitSelf?: boolean; countSelf?: boolean; sumSelf?: boolean; orderBy?: string; hump?: boolean; mapper?: string | SqlMapper; mapperIfUndefined?: MapperIfUndefined; }): Promise<PageQuery<L>>;
+    page<L = T>(option: MethodOption & { sync: SyncMode.Sync; sqlId: string; context?: any; params: Record<string, any>; pageSize?: number; pageNumber?: number; limitSelf?: boolean; countSelf?: boolean; sumSelf?: boolean; orderBy?: string; hump?: boolean; mapper?: string | SqlMapper; mapperIfUndefined?: MapperIfUndefined; }): PageQuery<L>;
     @P<T>()
-    page<L = T>(option: MethodOption & { sync?: SyncMode; sqlId: string; context?: any; params: Record<string, any>; pageSize: number; pageNumber: number; limitSelf?: boolean; countSelf?: boolean; sumSelf?: boolean; orderBy?: string; hump?: boolean; mapper?: string | SqlMapper; mapperIfUndefined?: MapperIfUndefined; }): PageQuery<L> | Promise<PageQuery<L>> {
+    page<L = T>(option: MethodOption & { sync?: SyncMode; sqlId: string; context?: any; params: Record<string, any>; pageSize?: number; pageNumber?: number; limitSelf?: boolean; countSelf?: boolean; sumSelf?: boolean; orderBy?: string; hump?: boolean; mapper?: string | SqlMapper; mapperIfUndefined?: MapperIfUndefined; }): PageQuery<L> | Promise<PageQuery<L>> {
         const result: PageQuery<L> = {
             sum: {},
             records: [],
             size: 0,
             total: 0
         };
+        option.pageNumber ??= 1;
+        option.pageSize ??= 0;
         Object.assign(option.params, {
             limitStart: calc(option.pageNumber).sub(1).mul(option.pageSize).over(),
             limitEnd: calc(option.pageSize).over(),
@@ -3495,7 +3492,7 @@ export class SqlService<T extends object> {
                             selectResult: SelectResult.R_C_Assert
                         });
                         result.size = calc(result.total)
-                            .add(option.pageSize - 1)
+                            .add(option.pageSize ?? 10 - 1)
                             .div(option.pageSize)
                             .round(0, 2)
                             .over();
@@ -3524,6 +3521,177 @@ export class SqlService<T extends object> {
         }
     }
 
+    /**
+     * 导出数据，可以为EJS-EXCEL直接使用
+     * @param list
+     * @returns 
+     */
+    exp<L = T>(list: L[]) {
+        Throw.if(list.length === 0, 'not found data!');
+        const columnTitles = new Array<string>();
+        const keys = this[_fields] ?
+            iterare(Object.entries(this[_fields]))
+                .filter(([K, F]) => (F.id !== true && F.exportable !== false) || (F.id === true && F.exportable === true))
+                .map(([K, F]) => {
+                    columnTitles.push(F.comment ?? K);
+                    return K;
+                }).toArray()
+            : Object.keys(list[0]!).filter(K => !this[_ids]?.includes(K));
+        const title = this[_comment] ?? this[_tableName];
+        const titleSpan = `A1:${ten2Any(keys.length)}1`;
+        const datas = list.map(data => keys.map(k => data[k] ?? ''));
+        return { title, titleSpan, columnTitles, datas };
+    }
+    /**
+     * 导入数据的模板
+     * @returns
+     */
+    imp() {
+        Throw.if(!this[_fields], 'not set fields!');
+        const columnTitles = new Array<string>();
+        const keys = iterare(Object.entries(this[_fields]!))
+            .filter(([K, F]) => (F.id !== true && F.exportable !== false) || (F.id === true && F.exportable === true))
+            .map(([K, F]) => {
+                columnTitles.push(F.comment ?? K);
+                return K;
+            }).toArray();
+        const title = this[_comment] ?? this[_tableName];
+        const titleSpan = `A1:${ten2Any(keys.length)}1`;
+        return { title, titleSpan, columnTitles };
+    }
+
+    /**
+     * 初始化表结构
+     * 只有sqlite、sqliteremote需要
+     * force: 是否强制，默认false, 强制时会删除再创建
+     * @param option
+     */
+    init(option?: MethodOption & { sync?: SyncMode.Async; force?: boolean }): Promise<void>;
+    init(option: MethodOption & { sync: SyncMode.Sync; force?: boolean }): void;
+    @P<T>()
+    init(option?: MethodOption & { sync?: SyncMode; force?: boolean }): void | Promise<void> {
+        const tableES = Sqlstring.escapeId(option!.tableName);
+        option!.force ??= false;
+        if (this[_dbType] === DBType.Sqlite) {
+            if (option?.force) {
+                option!.conn!.execute(SyncMode.Sync, `DROP TABLE IF EXISTS ${tableES};`);
+            }
+            const lastVersion = this[_sqlite_version] ?? '0.0.1';
+            // 检查表
+            const tableCheckResult = option!.conn!.pluck<number>(SyncMode.Sync, `SELECT COUNT(1) t FROM sqlite_master WHERE TYPE = 'table' AND name = ?`, [option!.tableName]);
+            if (tableCheckResult) {
+                // 旧版本
+                const tableVersion = option!.conn!.pluck<string>(SyncMode.Sync, 'SELECT ______version v from TABLE_VERSION WHERE ______tableName = ?', [option!.tableName]);
+                if (tableVersion && tableVersion < lastVersion) { // 发现需要升级的版本
+                    // 更新版本
+                    const columns = iterare<{ name: string }>(option!.conn!.query(SyncMode.Sync, `PRAGMA table_info(${tableES})`))
+                        .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(/\./, '_')}`);
+                    option!.conn!.execute(SyncMode.Sync, `DROP TABLE IF EXISTS ${rtable};`);
+                    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]?.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} ("${this[_fields]![index]?.C2()}");`);
+                        }
+                    }
+                    option!.conn!.execute(SyncMode.Sync, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
+                    option!.conn!.execute(SyncMode.Sync, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
+                    option!.conn!.execute(SyncMode.Sync, `DROP TABLE IF EXISTS ${rtable};`);
+                    // 更新完毕，保存版本号
+                    option!.conn!.execute(SyncMode.Sync, 'UPDATE TABLE_VERSION SET ______version = ? WHERE ______tableName = ?', [option!.tableName, lastVersion]);
+                } else if (!tableVersion) { // 不需要升级情况：没有旧的版本号
+                    option!.conn!.execute(SyncMode.Sync, 'INSERT INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option!.tableName, lastVersion]);
+                }
+            } else { // 表不存在
+                // 创建表
+                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]?.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} ("${this[_fields]![index]?.C2()}");`);
+                    }
+                }
+                option!.conn!.execute(SyncMode.Sync, 'INSERT OR REPLACE INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option!.tableName, lastVersion]);
+            }
+        } else if (this[_dbType] === DBType.SqliteRemote) {
+
+            return new Promise(async (resolve, reject) => {
+                try {
+                    if (option?.force) {
+                        await option!.conn!.execute(SyncMode.Async, `DROP TABLE IF EXISTS ${tableES};`);
+                    }
+                    const lastVersion = this[_sqlite_version] ?? '0.0.1';
+                    // 检查表
+                    const tableCheckResult = await option!.conn!.pluck<number>(SyncMode.Async, `SELECT COUNT(1) t FROM sqlite_master WHERE TYPE = 'table' AND name = ?`, [option!.tableName]);
+                    if (tableCheckResult) {
+                        // 旧版本
+                        const tableVersion = await option!.conn!.pluck<string>(SyncMode.Async, 'SELECT ______version v from TABLE_VERSION WHERE ______tableName = ?', [option!.tableName]);
+                        if (tableVersion && tableVersion < lastVersion) { // 发现需要升级的版本
+                            // 更新版本
+                            const columns = iterare<{ name: string }>(await option!.conn!.query(SyncMode.Async, `PRAGMA table_info(${tableES})`))
+                                .filter(c => this[_fields]!.hasOwnProperty(C2P(c.name, globalThis[_Hump])))
+                                .map(c => Sqlstring.escapeId(c.name))
+                                .join(',');
+
+                            const rtable = `${option!.tableName}_${tableVersion.replace(/\./, '_')}`;
+                            await option!.conn!.execute(SyncMode.Async, `DROP TABLE IF EXISTS ${rtable};`);
+                            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]?.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} ("${this[_fields]![index]?.C2()}");`);
+                                }
+                            }
+                            await option!.conn!.execute(SyncMode.Async, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
+                            await option!.conn!.execute(SyncMode.Async, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
+                            await option!.conn!.execute(SyncMode.Async, `DROP TABLE IF EXISTS ${rtable};`);
+                            // 更新完毕，保存版本号
+                            await option!.conn!.execute(SyncMode.Async, 'UPDATE TABLE_VERSION SET ______version = ? WHERE ______tableName = ?', [option!.tableName, lastVersion]);
+                        } else if (!tableVersion) { // 不需要升级情况：没有旧的版本号
+                            await option!.conn!.execute(SyncMode.Async, 'INSERT INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option!.tableName, lastVersion]);
+                        }
+                    } else { // 表不存在
+                        // 创建表
+                        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]?.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)} ("${this[_fields]![index]?.C2()}");`);
+                            }
+                        }
+                        await option!.conn!.execute(SyncMode.Async, 'INSERT OR REPLACE INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option!.tableName, lastVersion]);
+                    }
+                    resolve();
+                } catch (error) {
+                    reject(error);
+                }
+            });
+        }
+    }
+
     /**
     #创建表
     ** `tableName` 表名称
@@ -3569,16 +3737,16 @@ export class SqlService<T extends object> {
         tableName = Sqlstring.escapeId(tableName ?? this[_tableName]);
         switch (this[_dbType]) {
             case DBType.Mysql: {
-                let sql = format(`CREATE ${temp === true ? 'TEMPORARY' : ''} TABLE IF NOT EXISTS ${tableName}(
+                let sql = formatDialect(`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;`);
+                ) ENGINE=MEMORY;`, { dialect: this[_formatDialect]! });
                 sqls.push({ sql });
                 if (data && data.length > 0) {
                     const params: any[] = [];
                     let first = true;
-                    sql = format(`INSERT INTO ${tableName} (${columns.map(c => this[_fields]![c]?.C2()).join(',')})
+                    sql = formatDialect(`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);
@@ -3586,28 +3754,28 @@ export class SqlService<T extends object> {
                         }).join(',')}`;
                         first = false;
                         return r;
-                    }).join(' UNION ALL ')}`);
+                    }).join(' UNION ALL ')}`, { dialect: this[_formatDialect]! });
                     sqls.push({ sql, params });
                 }
                 break;
             }
             case DBType.Sqlite:
             case DBType.SqliteRemote: {
-                let sql = format(`CREATE ${temp === true ? 'TEMPORARY' : ''} TABLE IF NOT EXISTS ${tableName}(
+                let sql = formatDialect(`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(',')}) ` : ''}
-                );`);
+                );`, { dialect: this[_formatDialect]! });
                 sqls.push({ sql });
                 if (indexs) {
                     for (const index of indexs) {
-                        sql = format(`CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${tableName} (${this[_fields]![index]?.C2()});`);
+                        sql = formatDialect(`CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${tableName} (${this[_fields]![index]?.C2()});`, { dialect: this[_formatDialect]! });
                         sqls.push({ sql });
                     }
                 }
                 if (data && data.length > 0) {
                     const params: any[] = [];
                     let first = true;
-                    sql = format(`INSERT INTO ${tableName} (${columns.map(c => this[_fields]![c]?.C2()).join(',')})
+                    sql = formatDialect(`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);
@@ -3615,7 +3783,7 @@ export class SqlService<T extends object> {
                         }).join(',')}`;
                         first = false;
                         return r;
-                    }).join(' UNION ALL ')}`);
+                    }).join(' UNION ALL ')}`, { dialect: this[_formatDialect]! });
                     sqls.push({ sql, params });
                 }
                 break;
@@ -4100,7 +4268,10 @@ class StreamQuery<T extends object> {
             }
         }
         if (sets.length > 0) {
-            const sql = `UPDATE ${this._table} SET ${sets.join(',')} ${where}`;
+            const sql = `UPDATE ${this._table} SET ${sets.join(',')}
+            ${where ? ' WHERE ' : ''}
+            ${where}
+            `;
             if (option.sync === SyncMode.Async) {
                 return this._service.excute({ sync: SyncMode.Async, sql, params });
             } else {
@@ -4117,7 +4288,10 @@ class StreamQuery<T extends object> {
         option ??= {};
         option.sync ??= SyncMode.Async;
         const { where, params } = this._where();
-        const sql = `DELETE FROM ${this._table} ${where}`;
+        const sql = `DELETE FROM ${this._table}
+            ${where ? ' WHERE ' : ''}
+            ${where}
+        `;
         if (option.sync === SyncMode.Async) {
             return this._service.excute({ sync: SyncMode.Async, sql, params });
         } else {