baja-lite 1.0.7 → 1.0.16

package/es/sql.js

@@ -7,8 +7,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 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, _g;
+var _b, _c, _d;
+var _e, _f, _g, _h;
 import { Throw } from './error';
 import tslib from 'tslib';
 import Sqlstring from 'sqlstring';
@@ -16,14 +16,41 @@ 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 from 'mustache';
 import { C2P, C2P2, P2C } from './object';
-import { format } from 'sql-formatter';
+import { formatDialect, sqlite, mysql } from 'sql-formatter';
 import HTML from 'html-parse-stringify';
 import { convert } from './convert-xml';
 import { ArrayList } from './list';
 import LGet from 'lodash.get';
+import { encode, decode, ExtensionCodec, DecodeError } from "@msgpack/msgpack";
+BigInt.prototype.toJSON = function () { return this.toString(); };
+const BIGINT_EXT_TYPE = 0;
+export const extensionCodec = new ExtensionCodec();
+extensionCodec.register({
+    type: BIGINT_EXT_TYPE,
+    encode(input) {
+        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) {
+        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');
 const _tableName = Symbol('tableName');
@@ -31,6 +58,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');
@@ -39,10 +67,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');
@@ -51,6 +81,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');
@@ -235,7 +266,7 @@ export const _defOption = {
 ;
 class MysqlConnection {
     constructor(conn) {
-        this[_a] = false;
+        this[_b] = false;
         this[_daoConnection] = conn;
     }
     execute(sync, sql, params) {
@@ -418,7 +449,7 @@ class MysqlConnection {
         ;
     }
 }
-_a = _inTransaction;
+_b = _inTransaction;
 export class Mysql {
     constructor(pool) {
         this[_daoDB] = pool;
@@ -509,7 +540,7 @@ export class Mysql {
 }
 class SqliteConnection {
     constructor(conn) {
-        this[_b] = false;
+        this[_c] = false;
         this[_daoConnection] = conn;
     }
     execute(sync, sql, params) {
@@ -649,7 +680,7 @@ class SqliteConnection {
     realse(sync) {
     }
 }
-_b = _inTransaction;
+_c = _inTransaction;
 export class Sqlite {
     constructor(db) {
         this[_daoDB] = db;
@@ -714,7 +745,7 @@ export class Sqlite {
 }
 export class SqliteRemoteConnection {
     constructor(conn, name) {
-        this[_c] = false;
+        this[_d] = false;
         this[_daoConnection] = conn;
         this[_sqliteRemoteName] = name;
     }
@@ -734,7 +765,8 @@ export class SqliteRemoteConnection {
         }
         return new Promise(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 });
                 resolve({ affectedRows, insertId: insertId ? BigInt(insertId) : 0n });
             }
             catch (error) {
@@ -763,7 +795,8 @@ export class SqliteRemoteConnection {
         }
         return new Promise(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 });
                 resolve(r);
             }
             catch (error) {
@@ -792,7 +825,8 @@ export class SqliteRemoteConnection {
         }
         return new Promise(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 });
                 resolve(r);
             }
             catch (error) {
@@ -821,7 +855,8 @@ export class SqliteRemoteConnection {
         }
         return new Promise(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 });
                 resolve(r);
             }
             catch (error) {
@@ -850,7 +885,8 @@ export class SqliteRemoteConnection {
         }
         return new Promise(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 });
                 resolve(r);
             }
             catch (error) {
@@ -866,7 +902,7 @@ export class SqliteRemoteConnection {
     realse(sync) {
     }
 }
-_c = _inTransaction;
+_d = _inTransaction;
 export class SqliteRemote {
     constructor(db, name) {
         this[_daoDB] = db;
@@ -879,8 +915,11 @@ export class SqliteRemote {
         }
         ;
         return new Promise(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);
@@ -1208,6 +1247,31 @@ class Build {
             }
         };
     }
+    /**
+     * * PROBLEM_TYPE = 枚举名
+     * * t.problemtype = 列名
+     *
+     * ```
+     * {{#enumTag}} PROBLEM_TYPE(t.problemtype) {{/enumTag}}
+     * ```
+     */
+    enum() {
+        return (text) => {
+            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 "''";
+        };
+    }
 }
 Build.page = 'COUNT(1) zccw1986 ';
 function replaceCdata(rawText) {
@@ -1228,10 +1292,10 @@ function replaceCdata(rawText) {
     return rawText;
 }
 function _flatData(result, i, length, keys, V) {
-    var _d;
+    var _e;
     const key = keys[i];
     if (i < length) {
-        result[_d = key] ?? (result[_d] = {});
+        result[_e = key] ?? (result[_e] = {});
         i++;
         _flatData(result[key], i, length, keys, V);
     }
@@ -1426,19 +1490,14 @@ 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);
-            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 '';
     }
@@ -1469,12 +1528,9 @@ 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];
-            const tableES = Sqlstring.escapeId(option.tableName);
             if (this[_dbType] === DBType.Sqlite) {
                 Throw.if(option.sync === SyncMode.Async, 'sqlite can not Async!');
                 // 连接共享
@@ -1484,60 +1540,6 @@ function P(skipConn = false) {
                 else {
                     needRealseConn = false;
                 }
-                if (skipConn === false) {
-                    const lastVersion = this[_sqlite_version] ?? '0.0.1';
-                    // 检查表
-                    const tableCheckResult = option.conn.pluck(SyncMode.Sync, `SELECT COUNT(1) t FROM sqlite_master WHERE TYPE = 'table' AND name = ?`, [option.tableName]);
-                    if (tableCheckResult) {
-                        // 旧版本
-                        const tableVersion = option.conn.pluck(SyncMode.Sync, 'SELECT ______version v from TABLE_VERSION WHERE ______tableName = ?', [option.tableName]);
-                        if (tableVersion && tableVersion < lastVersion) { // 发现需要升级的版本
-                            // 更新版本
-                            const columns = iterare(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`);
@@ -1571,59 +1573,6 @@ function P(skipConn = false) {
                     else {
                         needRealseConn = false;
                     }
-                    if (skipConn === false) {
-                        const lastVersion = this[_sqlite_version] ?? '0.0.1';
-                        // 检查表
-                        const tableCheckResult = await option.conn.pluck(SyncMode.Async, `SELECT COUNT(1) t FROM sqlite_master WHERE TYPE = 'table' AND name = ?`, [option.tableName]);
-                        if (tableCheckResult) {
-                            // 旧版本
-                            const tableVersion = await option.conn.pluck(SyncMode.Async, 'SELECT ______version v from TABLE_VERSION WHERE ______tableName = ?', [option.tableName]);
-                            if (tableVersion && tableVersion < lastVersion) { // 发现需要升级的版本
-                                // 更新版本
-                                const columns = iterare(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`);
@@ -1755,6 +1704,7 @@ export const Field = (config) => {
             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) => BigInt(data ?? 0);
                 break;
             }
             case SqlType.float: {
@@ -1790,26 +1740,31 @@ export const Field = (config) => {
             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) => 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) => 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) => 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) => 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) => typeof data === 'string' ? +new Date(data) : data;
                 break;
             }
             case SqlType.char: {
@@ -1923,6 +1878,7 @@ export const Field = (config) => {
         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);
         if (!__fields) {
@@ -1941,16 +1897,23 @@ export const Field = (config) => {
         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')) {
@@ -1959,44 +1922,58 @@ export const Field = (config) => {
         }
     };
 };
+const formatDialects = {
+    [DBType.Mysql]: mysql,
+    [DBType.Sqlite]: sqlite,
+    [DBType.SqliteRemote]: sqlite
+};
 export const DB = (config) => {
     return function (constructor) {
-        var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+        var _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
         const __ids = Reflect.getMetadata(_ids, config.clz.prototype) || new Array;
+        const __logicIds = Reflect.getMetadata(_logicIds, config.clz.prototype) || new Array;
         const __fields = Reflect.getMetadata(_fields, config.clz.prototype);
         const __columns = Reflect.getMetadata(_columns, config.clz.prototype);
-        const __columnsNoId = __columns.filter((c) => __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, b) => b.toUpperCase());
         const ClassName = className?.replace(/\w/, (v) => v.toUpperCase());
         const vueName = config.tableName?.replace(/_/g, '-');
-        return _w = class extends constructor {
+        return _0 = class extends constructor {
                 constructor() {
                     super(...arguments);
-                    this[_d] = config.tableName;
-                    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) => {
+                    this[_e] = config.tableName;
+                    this[_f] = className;
+                    this[_g] = ClassName;
+                    this[_h] = vueName;
+                    this[_j] = config.dbName;
+                    this[_k] = __dbType;
+                    this[_l] = __formatDialect;
+                    this[_m] = config.sqliteVersion;
+                    this[_o] = Object.assign({}, _defOption, config);
+                    this[_p] = __ids;
+                    this[_q] = __logicIds;
+                    this[_r] = __fields;
+                    this[_s] = __columns;
+                    this[_t] = __columnsNoId;
+                    this[_u] = __index;
+                    this[_v] = __def;
+                    this[_w] = config.comment;
+                    this[_x] = __stateFileName;
+                    this[_y] = __deleteState;
+                    this[_z] = (data, option) => {
                         return Object.fromEntries(iterare(option?.skipId === true ? __columnsNoId : __columns)
                             .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 (__fields[data[0]].Data2SQL) {
+                                    data[1][1] = __fields[data[0]].Data2SQL(data[1][1]);
+                                }
                                 if (option?.onFieldExists) {
                                     option.onFieldExists(data[0], data[1][1]);
                                 }
@@ -2011,24 +1988,27 @@ export const DB = (config) => {
                     };
                 }
             },
-            _d = _tableName,
-            _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;
+            _e = _tableName,
+            _f = _className,
+            _g = _ClassName,
+            _h = _vueName,
+            _j = _daoDBName,
+            _k = _dbType,
+            _l = _formatDialect,
+            _m = _sqlite_version,
+            _o = _SqlOption,
+            _p = _ids,
+            _q = _logicIds,
+            _r = _fields,
+            _s = _columns,
+            _t = _columnsNoId,
+            _u = _index,
+            _v = _def,
+            _w = _comment,
+            _x = _stateFileName,
+            _y = _deleteState,
+            _z = _transformer,
+            _0;
     };
 };
 /**
@@ -2124,10 +2104,10 @@ export class SqlService {
                     return `SELECT ${questMark.join(',')} FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM ${tableName} WHERE ${where})`;
                 });
                 const columnNames = iterare(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;
             }
@@ -2165,12 +2145,12 @@ export class SqlService {
                     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;
             }
@@ -2208,12 +2188,12 @@ export class SqlService {
                     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;
             }
@@ -2257,16 +2237,16 @@ export class SqlService {
                 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;
@@ -2305,20 +2285,18 @@ export class SqlService {
         }
         else if (isArray) {
             const fn = async () => {
-                return await option?.dao?.transaction(SyncMode.Async, async () => {
-                    const result = await excuteSplit(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;
-                            }
+                const result = await excuteSplit(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);
+                }, { everyLength: option?.every === true ? 1 : option?.maxDeal });
+                return result;
             };
             return new Promise(async (resolve, reject) => {
                 try {
@@ -2387,13 +2365,13 @@ export class SqlService {
                 }
             });
         }
-        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;
     }
@@ -2482,14 +2460,14 @@ export class SqlService {
             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 {
@@ -2501,14 +2479,14 @@ export class SqlService {
                 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;
@@ -2518,13 +2496,13 @@ export class SqlService {
                     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;
                 }
@@ -2578,8 +2556,7 @@ export class SqlService {
                 return result[0];
             }
             case TemplateResult.NotSureOne: {
-                Throw.if(!result, error);
-                return result[0] ?? null;
+                return result && result.length > 0 ? result[0] ?? null : null;
             }
             case TemplateResult.Many: {
                 return result;
@@ -2615,13 +2592,13 @@ export class SqlService {
         let resultIndex = -1;
         if (option.mode === SelectMode.Common) {
             const params = new Array();
-            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;
         }
@@ -2631,7 +2608,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: 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};` });
         }
         if (option.sync === SyncMode.Sync) {
@@ -2760,7 +2737,7 @@ export class SqlService {
         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) => {
+        const sql = formatDialect(option.sql?.replace(/\:([A-Za-z0-9._]+)/g, (txt, key) => {
             let V = LGet(_params, key);
             if (V) {
                 if (V !== undefined) {
@@ -2785,7 +2762,7 @@ export class SqlService {
                 return '?';
             }
             return txt;
-        });
+        }), { dialect: this[_formatDialect] });
         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.hump, option.mapper, option.mapperIfUndefined);
@@ -2807,7 +2784,7 @@ export class SqlService {
         const _params = Object.assign({}, option.context, option.params);
         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) => {
+        const sql = formatDialect(option.sql?.replace(/\:(\w+)/g, (txt, key) => {
             let V = LGet(_params, key);
             if (V) {
                 if (V !== undefined) {
@@ -2832,7 +2809,7 @@ export class SqlService {
                 return '?';
             }
             return txt;
-        });
+        }), { dialect: this[_formatDialect] });
         if (option.sync === SyncMode.Sync) {
             const result = option.conn.execute(SyncMode.Sync, sql, params);
             return result.affectedRows;
@@ -2875,6 +2852,8 @@ export class SqlService {
             size: 0,
             total: 0
         };
+        option.pageNumber ?? (option.pageNumber = 1);
+        option.pageSize ?? (option.pageSize = 0);
         Object.assign(option.params, {
             limitStart: calc(option.pageNumber).sub(1).mul(option.pageSize).over(),
             limitEnd: calc(option.pageSize).over(),
@@ -2947,7 +2926,7 @@ export class SqlService {
                             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();
@@ -2976,6 +2955,170 @@ export class SqlService {
             });
         }
     }
+    /**
+     * 导出数据，可以为EJS-EXCEL直接使用
+     * @param list
+     * @returns
+     */
+    exp(list) {
+        Throw.if(list.length === 0, 'not found data!');
+        const columnTitles = new Array();
+        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();
+        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 };
+    }
+    init(option) {
+        var _e;
+        const tableES = Sqlstring.escapeId(option.tableName);
+        (_e = option).force ?? (_e.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(SyncMode.Sync, `SELECT COUNT(1) t FROM sqlite_master WHERE TYPE = 'table' AND name = ?`, [option.tableName]);
+            if (tableCheckResult) {
+                // 旧版本
+                const tableVersion = option.conn.pluck(SyncMode.Sync, 'SELECT ______version v from TABLE_VERSION WHERE ______tableName = ?', [option.tableName]);
+                if (tableVersion && tableVersion < lastVersion) { // 发现需要升级的版本
+                    // 更新版本
+                    const columns = iterare(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(SyncMode.Async, `SELECT COUNT(1) t FROM sqlite_master WHERE TYPE = 'table' AND name = ?`, [option.tableName]);
+                    if (tableCheckResult) {
+                        // 旧版本
+                        const tableVersion = await option.conn.pluck(SyncMode.Async, 'SELECT ______version v from TABLE_VERSION WHERE ______tableName = ?', [option.tableName]);
+                        if (tableVersion && tableVersion < lastVersion) { // 发现需要升级的版本
+                            // 更新版本
+                            const columns = iterare(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` 表名称
@@ -3020,16 +3163,16 @@ export class SqlService {
         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 = [];
                     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);
@@ -3037,28 +3180,28 @@ export class SqlService {
                         }).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 = [];
                     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);
@@ -3066,7 +3209,7 @@ export class SqlService {
                         }).join(',')}`;
                         first = false;
                         return r;
-                    }).join(' UNION ALL ')}`);
+                    }).join(' UNION ALL ')}`, { dialect: this[_formatDialect] });
                     sqls.push({ sql, params });
                 }
                 break;
@@ -3130,6 +3273,12 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Object)
 ], SqlService.prototype, "page", null);
+__decorate([
+    P(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Object)
+], SqlService.prototype, "init", null);
 /** 是否进行下一个动作 */
 const IF_PROCEED = function () {
     return function (_target, _propertyKey, descriptor) {
@@ -3507,7 +3656,10 @@ class StreamQuery {
             }
         }
         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 });
             }
@@ -3523,7 +3675,10 @@ class StreamQuery {
         option ?? (option = {});
         option.sync ?? (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 });
         }