baja-lite 1.0.27 → 1.0.30

package/src/sql.ts

@@ -1,6 +1,5 @@
 import { Throw } from './error';
 import tslib from 'tslib';
-import Sqlstring from 'sqlstring';
 import iterare from 'iterare';
 import { emptyString } from './string';
 import pino from 'pino';
@@ -8,7 +7,7 @@ import { excuteSplit, ExcuteSplitMode, sleep } from './fn';
 import { add, calc, ten2Any } from './math';
 import mustache, { PartialsOrLookupFn } from 'mustache';
 import { C2P, C2P2, P2C } from './object';
-import { formatDialect, sqlite, mysql, DialectOptions } from 'sql-formatter';
+import { formatDialect, sqlite, mysql, postgresql } from 'sql-formatter';
 import HTML from 'html-parse-stringify';
 import { XML, convert } from './convert-xml';
 import { ArrayList } from './list';
@@ -16,7 +15,6 @@ 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({
@@ -63,7 +61,6 @@ export const _sqlCache = Symbol('sqlMap');
 export const _dao = Symbol('dao');
 export const _primaryDB = '______primaryDB_______';
 const _dbType = Symbol('dbType');
-const _formatDialect = Symbol('FormatDialect');
 const _sqlite_version = Symbol('sqlite_version');
 const _daoConnection = Symbol('daoConnection');
 const _inTransaction = Symbol('inTransaction');
@@ -89,7 +86,7 @@ globalThis[_resultMap_SQLID] = {};
 // #endregion
 
 // #region 可选配置
-export enum DBType { Mysql, Sqlite, Mongo, SqliteRemote, Redis, RedisLock };
+export enum DBType { Mysql, Postgresql, Sqlite, Mongo, SqliteRemote, Redis, RedisLock };
 export enum MapperIfUndefined { Null, Skip, Zero, EmptyString };
 export enum SyncMode {
     /** 同步执行 */
@@ -214,19 +211,7 @@ export enum SqlType {
     longblob,
     longtext,
 
-    set,
-    enum,
-
-    json,
-
-    geometry,
-    point,
-    linestring,
-    polygon,
-    multipoint,
-    multilinestring,
-    multipolygon,
-    geometrycollection
+    json
 
 }
 export enum ColumnMode {
@@ -240,6 +225,7 @@ interface MethodOption {
     tableName?: string;
     /** 数据库、连接名称，对于MYSQL、mongo，适用于多数据源，对于sqlite，适用于不同的数据库文件  */
     dbName?: string;
+    dbType?: DBType;
     /** 调用时，永远不需要传
      * @deprecated
      * */
@@ -285,7 +271,6 @@ interface ServiceOption {
 }
 /**
  # 全局行为配置文件
-   MYSQL编码： 'utf8mb4', utf8mb4_general_ci'
  ### `sqlDir?: string;` 数据库查询语句存放目录.存放格式为 export.default 的js、ts， 存放内容满足格式：
 
     ```
@@ -310,7 +295,7 @@ export interface GlobalSqlOptionForWeb {
         ```
         db: 'd:/1.db'
         ```
-        ## 多数据源：传入多个Mysql2的连接配置
+        ## 多数据源：传入多个连接配置
         ```
         db: {
                 db1: 'd:/1.db',
@@ -360,6 +345,8 @@ export interface GlobalSqlOptionForWeb {
      * ```
      */
     columnMode?: ColumnMode;
+    /** 对于WEB模式，默认为SqliteRemote */
+    dbType?: DBType;
 }
 /**
  # 全局行为配置文件
@@ -400,12 +387,70 @@ export interface GlobalSqlOption extends GlobalSqlOptionForWeb {
        ```
       */
     Mysql?: Record<string, Record<string, any>> | Record<string, any>;
+    /**
+         初始化postgresql链接 支持多数据源
+         ## 单一数据源: 直接传入postgresql的连接配置
+         [Postgresql初始化文档](https://github.com/brianc/node-postgres/tree/master/packages/pg-pool)
+         ```
+         Postgresql: {
+            database: 'postgres',
+            user: 'brianc',
+            password: 'secret!',
+            port: 5432,
+            ssl: true,
+            max: 20, // set pool max size to 20
+            idleTimeoutMillis: 1000, // close idle clients after 1 second
+            connectionTimeoutMillis: 1000, // return an error after 1 second if connection could not be established
+            maxUses: 7500, // close (and replace) a connection after it has been used 7500 times (see below for discussion)
+            host?: string | undefined;
+            connectionString?: string | undefined;
+            keepAlive?: boolean | undefined;
+            stream?: () => stream.Duplex | stream.Duplex | undefined;
+            statement_timeout?: false | number | undefined;
+            query_timeout?: number | undefined;
+            keepAliveInitialDelayMillis?: number | undefined;
+            idle_in_transaction_session_timeout?: number | undefined;
+            application_name?: string | undefined;
+            types?: CustomTypesConfig | undefined;
+            options?: string | undefined;
+         }
+         ```
+         ## 多数据源：传入多个Postgresql的连接配置
+         ```
+         Postgresql: {
+            db1: {
+              database: 'postgres',
+              user: 'brianc',
+              password: 'secret!',
+              port: 5432,
+              ssl: true,
+              max: 20, // set pool max size to 20
+              idleTimeoutMillis: 1000, // close idle clients after 1 second
+              connectionTimeoutMillis: 1000, // return an error after 1 second if connection could not be established
+              maxUses: 7500, // close (and replace) a connection after it has been used 7500 times (see below for discussion)
+            },
+            db2: {
+              database: 'postgres',
+              user: 'brianc',
+              password: 'secret!',
+              port: 5432,
+              ssl: true,
+              max: 20, // set pool max size to 20
+              idleTimeoutMillis: 1000, // close idle clients after 1 second
+              connectionTimeoutMillis: 1000, // return an error after 1 second if connection could not be established
+              maxUses: 7500, // close (and replace) a connection after it has been used 7500 times (see below for discussion)
+            },
+            ...
+         }
+         ```
+        */
+    Postgresql?: Record<string, Record<string, any>> | Record<string, any>;
     /**
      ## 单一数据源
      ```
      Sqlite: 'd:/1.db'
      ```
-     ## 多数据源：传入多个Mysql2的连接配置
+     ## 多数据源：传入多个连接配置
      ```
        Sqlite: {
             db1: 'd:/1.db',
@@ -535,6 +580,7 @@ interface AField extends FieldOption {
     /** 查询用：b_id bId */
     C3: () => string;
 
+    [DBType.Postgresql]: () => string;
     [DBType.Mysql]: () => string;
     [DBType.Sqlite]: () => string;
     [DBType.SqliteRemote]: () => string;
@@ -613,7 +659,7 @@ class MysqlConnection implements Connection {
             return { affectedRows: 0, insertId: 0n };
         };
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql!, params));
+            logger.trace(sql!, params);
         }
         return new Promise<{ affectedRows: number; insertId: bigint; }>(async (resolve, reject) => {
             try {
@@ -644,7 +690,7 @@ class MysqlConnection implements Connection {
             return null;
         };
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql!, params));
+            logger.trace(sql!, params);
         }
         return new Promise<T | null>(async (resolve, reject) => {
             try {
@@ -676,7 +722,7 @@ class MysqlConnection implements Connection {
             return null;
         };
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql!, params));
+            logger.trace(sql!, params);
         }
         return new Promise<T | null>(async (resolve, reject) => {
             try {
@@ -707,7 +753,7 @@ class MysqlConnection implements Connection {
             return [];
         };
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql!, params));
+            logger.trace(sql!, params);
         }
         return new Promise<T[]>(async (resolve, reject) => {
             try {
@@ -738,7 +784,7 @@ class MysqlConnection implements Connection {
             return [];
         };
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql!, params));
+            logger.trace(sql!, params);
         }
         return new Promise<T[]>(async (resolve, reject) => {
             try {
@@ -776,6 +822,12 @@ export class Mysql implements Dao {
         this[_daoDB] = pool;
     }
 
+    async keepAlive() {
+        const connection = await this[_daoDB].getConnection();
+        connection.query('SELECT 1 FROM DUAL');
+        setTimeout(async () => await this.keepAlive(), 60000);
+    }
+
     createConnection(sync: SyncMode.Sync): Connection | null;
     createConnection(sync: SyncMode.Async): Promise<Connection | null>;
     createConnection(sync: SyncMode): Connection | null | Promise<Connection | null> {
@@ -870,6 +922,307 @@ export class Mysql implements Dao {
     restore(sync: SyncMode, name: string): Promise<void> | void {
     }
 }
+
+class PostgresqlConnection implements Connection {
+    [_daoConnection]: any;
+    [_inTransaction] = false;
+    constructor(conn: any) {
+        this[_daoConnection] = conn;
+    }
+
+    execute(sync: SyncMode.Sync, sql?: string, params?: any): { affectedRows: number; insertId: bigint; };
+    execute(sync: SyncMode.Async, sql?: string, params?: any): Promise<{ affectedRows: number; insertId: bigint; }>;
+    execute(sync: SyncMode, sql?: string, params?: any): { affectedRows: number; insertId: bigint; } | Promise<{ affectedRows: number; insertId: bigint; }> {
+        logger.debug(sql, params ?? '');
+        if (!sql) { return { affectedRows: 0, insertId: 0n }; };
+        if (sync === SyncMode.Sync) {
+            logger.warn('Postgresql not suppouted sync mode');
+            return { affectedRows: 0, insertId: 0n };
+        };
+        if (globalThis[_GlobalSqlOption].log === 'trace') {
+            logger.trace(sql!, params);
+        }
+        return new Promise<{ affectedRows: number; insertId: bigint; }>(async (resolve, reject) => {
+            try {
+                let index = 1;
+                const { rowCount } = await this[_daoConnection].query({
+                    text: sql.replace(/\?/g, () => `$${index++}`),
+                    values: params
+                });
+                const result = rowCount as any;
+                if (globalThis[_GlobalSqlOption].log === 'trace') {
+                    logger.trace(result);
+                }
+                resolve({ affectedRows: result.affectedRows, insertId: result.insertId });
+            } catch (error) {
+                logger.error(`
+                    error: ${error},
+                    sql: ${sql},
+                    params: ${params}
+                `);
+                reject(error);
+            }
+        });
+    }
+
+    pluck<T = any>(sync: SyncMode.Sync, sql?: string, params?: any): T | null;
+    pluck<T = any>(sync: SyncMode.Async, sql?: string, params?: any): Promise<T | null>;
+    pluck<T = any>(sync: SyncMode, sql?: string, params?: any): T | null | Promise<T | null> {
+        logger.debug(sql, params ?? '');
+        if (!sql) { return null };
+        if (sync === SyncMode.Sync) {
+            logger.warn('Postgresql not suppouted sync mode');
+            return null;
+        };
+        if (globalThis[_GlobalSqlOption].log === 'trace') {
+            logger.trace(sql!, params);
+        }
+        return new Promise<T | null>(async (resolve, reject) => {
+            try {
+                let index = 1;
+                const { rows } = await this[_daoConnection].query({
+                    text: sql.replace(/\?/g, () => `$${index++}`),
+                    values: params
+                });
+                if (rows && rows[0]) {
+                    const r = Object.values(rows[0])[0];
+                    if (r === null) resolve(r);
+                    else resolve(r as T);
+                }
+                resolve(null);
+            } catch (error) {
+                logger.error(`
+                    error: ${error},
+                    sql: ${sql},
+                    params: ${params}
+                `);
+                reject(error);
+            }
+        });
+    }
+
+    get<T = any>(sync: SyncMode.Sync, sql?: string, params?: any): T | null;
+    get<T = any>(sync: SyncMode.Async, sql?: string, params?: any): Promise<T | null>;
+    get<T = any>(sync: SyncMode, sql?: string, params?: any): T | null | Promise<T | null> {
+        logger.debug(sql, params ?? '');
+        if (!sql) { return null };
+        if (sync === SyncMode.Sync) {
+            logger.warn('Postgresql not suppouted sync mode');
+            return null;
+        };
+        if (globalThis[_GlobalSqlOption].log === 'trace') {
+            logger.trace(sql!, params);
+        }
+        return new Promise<T | null>(async (resolve, reject) => {
+            try {
+                let index = 1;
+                const { rows } = await this[_daoConnection].query({
+                    text: sql.replace(/\?/g, () => `$${index++}`),
+                    values: params
+                });
+                if (globalThis[_GlobalSqlOption].log === 'trace') {
+                    logger.trace(rows);
+                }
+                if (rows && rows[0]) resolve(rows[0] as T);
+                resolve(null);
+            } catch (error) {
+                logger.error(`
+                    error: ${error},
+                    sql: ${sql},
+                    params: ${params}
+                `);
+                reject(error);
+            }
+        });
+    }
+
+    raw<T = any>(sync: SyncMode.Sync, sql?: string, params?: any): T[];
+    raw<T = any>(sync: SyncMode.Async, sql?: string, params?: any): Promise<T[]>;
+    raw<T = any>(sync: SyncMode, sql?: string, params?: any): T[] | Promise<T[]> {
+        logger.debug(sql, params ?? '');
+        if (!sql) { return []; };
+        if (sync === SyncMode.Sync) {
+            logger.warn('Postgresql not suppouted sync mode');
+            return [];
+        };
+        if (globalThis[_GlobalSqlOption].log === 'trace') {
+            logger.trace(sql!, params);
+        }
+        return new Promise<T[]>(async (resolve, reject) => {
+            try {
+                let index = 1;
+                const { rows } = await this[_daoConnection].query({
+                    text: sql.replace(/\?/g, () => `$${index++}`),
+                    values: params
+                });
+                if (globalThis[_GlobalSqlOption].log === 'trace') {
+                    logger.trace(rows);
+                }
+                if (rows) resolve(rows.map((i: any) => Object.values(i)[0]));
+                resolve([]);
+            } catch (error) {
+                logger.error(`
+                    error: ${error},
+                    sql: ${sql},
+                    params: ${params}
+                `);
+                reject(error);
+            }
+        });
+    }
+
+    query<T = any>(sync: SyncMode.Sync, sql?: string, params?: any): T[];
+    query<T = any>(sync: SyncMode.Async, sql?: string, params?: any): Promise<T[]>;
+    query<T = any>(sync: SyncMode, sql?: string, params?: any): T[] | Promise<T[]> {
+        logger.debug(sql, params ?? '');
+        if (!sql) { return []; };
+        if (sync === SyncMode.Sync) {
+            logger.warn('Postgresql not suppouted sync mode');
+            return [];
+        };
+        if (globalThis[_GlobalSqlOption].log === 'trace') {
+            logger.trace(sql!, params);
+        }
+        return new Promise<T[]>(async (resolve, reject) => {
+            try {
+                let index = 1;
+                const { rows } = await this[_daoConnection].query({
+                    text: sql.replace(/\?/g, () => `$${index++}`),
+                    values: params
+                });
+                if (globalThis[_GlobalSqlOption].log === 'trace') {
+                    logger.trace(rows);
+                }
+                resolve(rows);
+            } catch (error) {
+                logger.error(`
+                    error: ${error},
+                    sql: ${sql},
+                    params: ${params}
+                `);
+                reject(error);
+            }
+        });
+    }
+
+    realse(sync: SyncMode.Sync): void;
+    realse(sync: SyncMode.Async): Promise<void>;
+    realse(sync: SyncMode): Promise<void> | void {
+        if (sync === SyncMode.Sync) {
+            try {
+                this[_daoConnection]?.release();
+            } catch (error) {
+
+            }
+        };
+    }
+}
+export class Postgresql implements Dao {
+    [_daoDB]: any;
+    constructor(pool: any) {
+        this[_daoDB] = pool;
+    }
+
+    async keepAlive() {
+        const connection = await this[_daoDB].connect();
+        connection.query('SELECT 1');
+        setTimeout(async () => await this.keepAlive(), 60000);
+    }
+
+    createConnection(sync: SyncMode.Sync): Connection | null;
+    createConnection(sync: SyncMode.Async): Promise<Connection | null>;
+    createConnection(sync: SyncMode): Connection | null | Promise<Connection | null> {
+        if (sync === SyncMode.Sync) {
+            logger.error('Postgresql not suppouted sync mode');
+            return null;
+        };
+        return new Promise<Connection>(async (resolve, reject) => {
+            try {
+                const connection = await this[_daoDB].connect();
+                logger.debug('create new connection!');
+                resolve(new PostgresqlConnection(connection));
+            } catch (error) {
+                reject(error);
+            }
+        });
+    }
+
+    transaction<T = any>(sync: SyncMode.Sync, fn: (conn: Connection) => T, conn?: Connection | null): T | null;
+    transaction<T = any>(sync: SyncMode.Async, fn: (conn: Connection) => Promise<T>, conn?: Connection | null): Promise<T | null>;
+    transaction<T = any>(sync: SyncMode, fn: (conn: Connection) => T | Promise<T>, conn?: Connection | null): T | null | Promise<T | null> {
+        if (sync === SyncMode.Sync) {
+            logger.warn('Postgresql not suppouted sync mode');
+            return null;
+        };
+        return new Promise<T>(async (resolve, reject) => {
+            let needCommit = false;
+            let newConn = false;
+            if (!conn) {
+                conn = await this.createConnection(SyncMode.Async) ?? undefined;
+                newConn = true;
+            }
+            if (conn?.[_inTransaction] !== true) {
+                needCommit = true;
+                logger.debug('beginTransaction begin!');
+                await conn![_daoConnection].query('BEGIN');
+                logger.debug('beginTransaction end!');
+            }
+            conn![_inTransaction] = true;
+            try {
+                const result = await fn(conn!);
+                if (needCommit === true) {
+                    logger.debug('commit begin!');
+                    await conn![_daoConnection].query('COMMIT');
+                    conn![_inTransaction] = false;
+                    logger.debug('commit end!');
+                }
+                resolve(result);
+            } catch (error) {
+                logger.debug('rollback begin!');
+                await conn![_daoConnection].query('ROLLBACK');
+                logger.debug('rollback end!');
+                conn![_inTransaction] = false;
+                logger.error(error);
+                reject(error);
+            } finally {
+                try {
+                    if (needCommit === true) {
+                        conn![_inTransaction] = false;
+                    }
+                    if (newConn === true) {
+                        logger.debug('release begin!');
+                        conn![_daoConnection].release();
+                        logger.debug('release end!');
+                    }
+                } catch (error) {
+                }
+            }
+        });
+    }
+
+    close(sync: SyncMode.Sync): void;
+    close(sync: SyncMode.Async): Promise<void>;
+    close(sync: SyncMode): Promise<void> | void {
+        if (sync === SyncMode.Sync) {
+            this[_daoDB]?.end();
+        };
+    }
+
+    backup(sync: SyncMode.Sync, name: string): void;
+    backup(sync: SyncMode.Async, name: string): Promise<void>;
+    backup(sync: SyncMode, name: string): Promise<void> | void {
+    }
+
+    remove(sync: SyncMode.Sync): void;
+    remove(sync: SyncMode.Async): Promise<void>;
+    remove(sync: SyncMode): Promise<void> | void {
+    }
+
+    restore(sync: SyncMode.Sync, name: string): void;
+    restore(sync: SyncMode.Async, name: string): Promise<void>;
+    restore(sync: SyncMode, name: string): Promise<void> | void {
+    }
+}
 class SqliteConnection implements Connection {
     [_daoConnection]: any;
     [_inTransaction] = false;
@@ -888,7 +1241,7 @@ class SqliteConnection implements Connection {
                 return { affectedRows: 0, insertId: 0n };
             };
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(Sqlstring.format(sql!, params));
+                logger.trace(sql!, params);
             }
             const result = this[_daoConnection].prepare(sql).run(params ?? {});
             if (globalThis[_GlobalSqlOption].log === 'trace') {
@@ -917,7 +1270,7 @@ class SqliteConnection implements Connection {
                 return null;
             };
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(Sqlstring.format(sql!, params));
+                logger.trace(sql!, params);
             }
             return this[_daoConnection].prepare(sql).pluck().get(params ?? {});
         } catch (error) {
@@ -938,7 +1291,7 @@ class SqliteConnection implements Connection {
             if (!sql) { return null };
             if (sync === SyncMode.Async) { return null };
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(Sqlstring.format(sql!, params));
+                logger.trace(sql!, params);
             }
             return this[_daoConnection].prepare(sql).get(params ?? {});
         } catch (error) {
@@ -962,7 +1315,7 @@ class SqliteConnection implements Connection {
                 return [];
             };
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(Sqlstring.format(sql!, params));
+                logger.trace(sql!, params);
             }
             return this[_daoConnection].prepare(sql).raw().all(params ?? {});
         } catch (error) {
@@ -986,7 +1339,7 @@ class SqliteConnection implements Connection {
                 return [];
             };
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(Sqlstring.format(sql!, params));
+                logger.trace(sql!, params);
             }
             return this[_daoConnection].prepare(sql).all(params ?? {});
         } catch (error) {
@@ -1101,7 +1454,7 @@ export class SqliteRemoteConnection implements Connection {
             return { affectedRows: 0, insertId: 0n };
         };
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql!, params));
+            logger.trace(sql!, params);
         }
         return new Promise<{ affectedRows: number; insertId: bigint; }>(async (resolve, reject) => {
             try {
@@ -1129,7 +1482,7 @@ export class SqliteRemoteConnection implements Connection {
             return null;
         };
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql!, params));
+            logger.trace(sql!, params);
         }
         return new Promise<T | null>(async (resolve, reject) => {
             try {
@@ -1157,7 +1510,7 @@ export class SqliteRemoteConnection implements Connection {
             return null;
         };
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql!, params));
+            logger.trace(sql!, params);
         }
         return new Promise<T | null>(async (resolve, reject) => {
             try {
@@ -1185,7 +1538,7 @@ export class SqliteRemoteConnection implements Connection {
             return [];
         };
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql!, params));
+            logger.trace(sql!, params);
         }
         return new Promise<T[]>(async (resolve, reject) => {
             try {
@@ -1213,7 +1566,7 @@ export class SqliteRemoteConnection implements Connection {
             return [];
         };
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql!, params));
+            logger.trace(sql!, params);
         }
         return new Promise<T[]>(async (resolve, reject) => {
             try {
@@ -1878,17 +2231,17 @@ 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;
             option!.tableName = option?.tableName ?? this[_tableName];
+            option!.dbName = option?.dbName ?? this[_daoDBName] ?? _primaryDB;
+            option!.dbType = this[_dbType] ?? globalThis[_GlobalSqlOption].dbType ?? DBType.Mysql;
+            option!.dao = globalThis[_dao][option!.dbType!][option!.dbName] as Dao;
 
-            const dbName = option?.dbName ?? this[_daoDBName] ?? _primaryDB;
-            option!.dao = globalThis[_dao][this[_dbType]!][dbName] as Dao;
-
-            if (this[_dbType] === DBType.Sqlite) {
+            if (option!.dbType === DBType.Sqlite) {
                 if (!option!.dao) {
-                    const db = new Sqlite(new globalThis[_GlobalSqlOption].BetterSqlite3(dbName as any, { fileMustExist: false }));
-                    if (globalThis[_dao][this[_dbType]!][_primaryDB] === undefined) {
-                        globalThis[_dao][this[_dbType]!][_primaryDB] = db;
+                    const db = new Sqlite(new globalThis[_GlobalSqlOption].BetterSqlite3(option!.dbName as any, { fileMustExist: false }));
+                    if (globalThis[_dao][option!.dbType!][_primaryDB] === undefined) {
+                        globalThis[_dao][option!.dbType!][_primaryDB] = db;
                     }
-                    globalThis[_dao][this[_dbType]!][dbName] = db;
+                    globalThis[_dao][option!.dbType!][option!.dbName] = db;
                     option!.dao = db;
                 }
 
@@ -1918,14 +2271,14 @@ function P<T extends object>(skipConn = false) {
                         }
                     }
                 }
-            } else if (this[_dbType] === DBType.SqliteRemote) {
+            } else if (option!.dbType === DBType.SqliteRemote) {
                 if (!option!.dao) {
-                    globalThis[_GlobalSqlOption].SqliteRemote.service.initDB(dbName);
-                    const db = new SqliteRemote(globalThis[_GlobalSqlOption].SqliteRemote.service, dbName as any);
-                    if (globalThis[_dao][this[_dbType]!][_primaryDB] === undefined) {
-                        globalThis[_dao][this[_dbType]!][_primaryDB] = db;
+                    globalThis[_GlobalSqlOption].SqliteRemote.service.initDB(option!.dbName);
+                    const db = new SqliteRemote(globalThis[_GlobalSqlOption].SqliteRemote.service, option!.dbName as any);
+                    if (globalThis[_dao][option!.dbType!][_primaryDB] === undefined) {
+                        globalThis[_dao][option!.dbType!][_primaryDB] = db;
                     }
-                    globalThis[_dao][this[_dbType]!][dbName] = db;
+                    globalThis[_dao][option!.dbType!][option!.dbName] = db;
                     option!.dao = db;
                 }
 
@@ -1955,8 +2308,34 @@ function P<T extends object>(skipConn = false) {
                     }
                 });
 
-            } else if (this[_dbType] === DBType.Mysql) {
-                Throw.if(!option!.dao, `not found db:${String(dbName)}(${this[_dbType]})`);
+            } else if (option!.dbType === DBType.Mysql) {
+                Throw.if(!option!.dao, `not found db:${String(option!.dbName)}(${option!.dbType})`);
+                return new Promise(async (resolve, reject) => {
+                    try {
+                        // 连接共享
+                        if (skipConn === false && !option!.conn) {
+                            (option!).conn = await option!.dao!.createConnection(SyncMode.Async);
+                        } else {
+                            needRealseConn = false;
+                        }
+                        const result = await fn.call(this, ...args);
+                        logger.info(`${propertyKey}:${option!.tableName}:use ${+new Date() - startTime}ms`);
+                        resolve(result);
+                    } catch (error) {
+                        console.error(`service ${propertyKey} have an error:${error}, it's argumens: ${JSON.stringify(args.filter(i => typeof i !== 'object' || (typeof i === 'object' && !i.insert)))}`)
+                        reject(error);
+                    } finally {
+                        if (needRealseConn && option && option!.conn) {
+                            try {
+                                option!.conn!.realse(SyncMode.Sync);
+                            } catch (error) {
+
+                            }
+                        }
+                    }
+                });
+            } else if (option!.dbType === DBType.Postgresql) {
+                Throw.if(!option!.dao, `not found db:${String(option!.dbName)}(${option!.dbType})`);
                 return new Promise(async (resolve, reject) => {
                     try {
                         // 连接共享
@@ -2024,207 +2403,183 @@ const FieldFilter = (
     return [ret, V];
 }
 const MYSQLCHARSET = `CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci`;
+const POSTGRESCHARSET = `COLLATE "pg_catalog"."default"`;
 export const Field = (config: FieldOption) => {
     config.type ??= SqlType.varchar;
     return (object: object, propertyName: string) => {
         const field = config as AField;
         field.P = propertyName;
         field.C = () => P2C(propertyName, globalThis[_Hump]);
-        field.C2 = () => Sqlstring.escapeId(P2C(propertyName, globalThis[_Hump]));
-        field.C3 = () => `${Sqlstring.escapeId(P2C(propertyName, globalThis[_Hump]))} ${propertyName}`;
+        field.C2 = () => P2C(propertyName, globalThis[_Hump]);
+        field.C3 = () => `${P2C(propertyName, globalThis[_Hump])} ${propertyName}`;
         const hasDef = field.hasOwnProperty('def') === true;
         switch (field.type) {
             case SqlType.tinyint: {
-                field[DBType.Mysql] = () => `${field.C2()} tinyint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Mysql] = () => `${field.C2()} tinyint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT ${field.def}` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} int2 ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT ${field.def}` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} integer`;
                 break;
             }
             case SqlType.smallint: {
-                field[DBType.Mysql] = () => `${field.C2()} smallint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Mysql] = () => `${field.C2()} smallint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT ${field.def}` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} int2 ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT ${field.def}` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} integer`;
                 break;
             }
             case SqlType.mediumint: {
-                field[DBType.Mysql] = () => `${field.C2()} smallint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Mysql] = () => `${field.C2()} smallint ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT ${field.def}` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} int4 ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT ${field.def}` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} integer`;
                 break;
             }
             case SqlType.int: {
-                field[DBType.Mysql] = () => `${field.C2()} int ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Mysql] = () => `${field.C2()} int ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT ${field.def}` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} int4 ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT ${field.def}` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} integer`;
                 break;
             }
             case SqlType.bigint: {
                 field[DBType.Mysql] = () => `${field.C2()} bigint ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} int8 ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} integer`;
                 field.Data2SQL = (data: any) => BigInt(data ?? 0);
                 break;
             }
             case SqlType.float: {
-                field[DBType.Mysql] = () => `${field.C2()} float(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''} `;
+                field[DBType.Mysql] = () => `${field.C2()} float4(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''} `;
+                field[DBType.Postgresql] = () => `${field.C2()} float4(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''} `;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} real`;
                 break;
             }
             case SqlType.double: {
                 field[DBType.Mysql] = () => `${field.C2()} double(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''} `;
+                field[DBType.Postgresql] = () => `${field.C2()} float8(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''} `;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} real`;
                 break;
             }
             case SqlType.decimal: {
                 field[DBType.Mysql] = () => `${field.C2()} decimal(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''} `;
+                field[DBType.Postgresql] = () => `${field.C2()} numeric(${config.length ?? 1}, ${config.scale ?? 2}) ${config.notNull === true ? 'NOT NULL' : ''} ${hasDef ? `DEFAULT '${field.def}'` : ''} `;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} real`;
                 break;
             }
 
             case SqlType.longtext: {
                 field[DBType.Mysql] = () => `${field.C2()} longtext ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.mediumtext: {
                 field[DBType.Mysql] = () => `${field.C2()} mediumtext ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.text: {
                 field[DBType.Mysql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.date: {
                 field[DBType.Mysql] = () => `${field.C2()} date ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} date ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${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.Postgresql] = () => `${field.C2()} time ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${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.Postgresql] = () => `${field.C2()} int4 ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${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.Postgresql] = () => `${field.C2()} timestamp ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${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.Postgresql] = () => `${field.C2()} timestamp ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${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: {
                 field[DBType.Mysql] = () => `${field.C2()} char(${config.length ?? 1}) ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} char(${config.length ?? 1}) ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.varchar: {
                 field[DBType.Mysql] = () => `${field.C2()} varchar(${config.length ?? 1}) ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} varchar(${config.length ?? 1}) ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.tinyblob: {
                 field[DBType.Mysql] = () => `${field.C2()} tinyblob ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} bytea ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.tinytext: {
                 field[DBType.Mysql] = () => `${field.C2()} tinytext ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.blob: {
                 field[DBType.Mysql] = () => `${field.C2()} binary ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} bytea ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.text: {
                 field[DBType.Mysql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.mediumblob: {
                 field[DBType.Mysql] = () => `${field.C2()} mediumblob ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} bytea ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.mediumtext: {
                 field[DBType.Mysql] = () => `${field.C2()} mediumtext ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.longblob: {
                 field[DBType.Mysql] = () => `${field.C2()} longblob ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} bytea ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.longtext: {
                 field[DBType.Mysql] = () => `${field.C2()} longtext ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-
-            case SqlType.set: {
-                field[DBType.Mysql] = () => `${field.C2()} set ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.enum: {
-                field[DBType.Mysql] = () => `${field.C2()} enum ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} text ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
             case SqlType.json: {
                 field[DBType.Mysql] = () => `${field.C2()} json ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-
-            case SqlType.geometry: {
-                field[DBType.Mysql] = () => `${field.C2()} geometry ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.point: {
-                field[DBType.Mysql] = () => `${field.C2()} point ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.linestring: {
-                field[DBType.Mysql] = () => `${field.C2()} linestring ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.polygon: {
-                field[DBType.Mysql] = () => `${field.C2()} polygon ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.multipoint: {
-                field[DBType.Mysql] = () => `${field.C2()} multipoint ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.multilinestring: {
-                field[DBType.Mysql] = () => `${field.C2()} multilinestring ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.multipolygon: {
-                field[DBType.Mysql] = () => `${field.C2()} multipolygon ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-            case SqlType.geometrycollection: {
-                field[DBType.Mysql] = () => `${field.C2()} geometrycollection ${config.notNull === true ? 'NOT NULL' : ''} ${MYSQLCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
+                field[DBType.Postgresql] = () => `${field.C2()} jsonb ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
                 field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
                 break;
             }
@@ -2277,7 +2632,8 @@ export const Field = (config: FieldOption) => {
 const formatDialects = {
     [DBType.Mysql]: mysql,
     [DBType.Sqlite]: sqlite,
-    [DBType.SqliteRemote]: sqlite
+    [DBType.SqliteRemote]: sqlite,
+    [DBType.Postgresql]: postgresql,
 };
 export const DB = (config: ServiceOption) => {
     return function <C extends { new(...args: any[]): {} }>(constructor: C) {
@@ -2290,8 +2646,7 @@ export const DB = (config: ServiceOption) => {
         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 __dbType = config.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, '-');
@@ -2303,7 +2658,6 @@ export const DB = (config: ServiceOption) => {
 
             [_daoDBName] = config.dbName;
             [_dbType] = __dbType;
-            [_formatDialect] = __formatDialect;
             [_sqlite_version] = config.sqliteVersion;
             [_SqlOption] = Object.assign({}, _defOption, config);
 
@@ -2412,7 +2766,6 @@ 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>;
@@ -2434,7 +2787,7 @@ export class SqlService<T extends object> {
         }): { sql: string; params?: any[] }[] {
 
         const sqls: { sql: string; params?: any[] }[] = [];
-        const tableName = Sqlstring.escapeId(option!.tableName);
+        const tableName = option!.tableName;
         switch (option?.mode) {
             case InsertMode.InsertIfNotExists: {
                 const conditions = option!.existConditionOtherThanIds || this[_ids];
@@ -2457,9 +2810,28 @@ export class SqlService<T extends object> {
                             if (V === null) {
                                 const field = this[_fields]![column];
                                 if (field?.uuid) {
-                                    questMark.push('UUID()');
-                                } else if (field?.uuidShort && this[_dbType] === DBType.Mysql) {
-                                    questMark.push('UUID_SHORT()');
+                                    switch (option.dbType) {
+                                        case DBType.Postgresql:
+                                            questMark.push('gen_random_uuid()');
+                                            break;
+                                        default:
+                                            questMark.push('UUID()');
+                                            break;
+                                    }
+                                } else if (field?.uuidShort) {
+                                    switch (option.dbType) {
+                                        case DBType.Postgresql:
+                                            questMark.push(`encode(uuid_send(gen_random_uuid()::uuid),'base64')`);
+                                            break;
+                                        case DBType.Mysql:
+                                            questMark.push('UUID_SHORT()');
+                                            break;
+                                        default:
+                                            questMark.push('?');
+                                            params.push(V);
+                                            break;
+
+                                    }
                                 } else {
                                     questMark.push('?');
                                     params.push(V);
@@ -2484,7 +2856,7 @@ export class SqlService<T extends object> {
                 const sql = formatDialect(`INSERT INTO
                 ${tableName}
                 (${columnNames})
-                ${questMarks.join(' UNION ALL ')};`, { dialect: this[_formatDialect]! });
+                ${questMarks.join(' UNION ALL ')};`, { dialect: formatDialects[option!.dbType!] });
                 sqls.push({ sql, params });
                 break;
             }
@@ -2504,9 +2876,28 @@ export class SqlService<T extends object> {
                             if (V === null) {
                                 const field = this[_fields]![column];
                                 if (field?.uuid) {
-                                    questMark.push('UUID()');
-                                } else if (field?.uuidShort && this[_dbType] === DBType.Mysql) {
-                                    questMark.push('UUID_SHORT()');
+                                    switch (option.dbType) {
+                                        case DBType.Postgresql:
+                                            questMark.push('gen_random_uuid()');
+                                            break;
+                                        default:
+                                            questMark.push('UUID()');
+                                            break;
+                                    }
+                                } else if (field?.uuidShort) {
+                                    switch (option.dbType) {
+                                        case DBType.Postgresql:
+                                            questMark.push(`encode(uuid_send(gen_random_uuid()::uuid),'base64')`);
+                                            break;
+                                        case DBType.Mysql:
+                                            questMark.push('UUID_SHORT()');
+                                            break;
+                                        default:
+                                            questMark.push('?');
+                                            params.push(V);
+                                            break;
+
+                                    }
                                 } else {
                                     questMark.push('?');
                                     params.push(V);
@@ -2520,11 +2911,11 @@ export class SqlService<T extends object> {
                     });
                 const columnNames = iterare(finalColumns).map(i => this[_fields]![i]?.C2()).join(',');
                 const sql = formatDialect(`
-                    ${this[_dbType] === DBType.Mysql ? '' : 'INSERT OR'} REPLACE INTO
+                    ${option!.dbType === DBType.Mysql ? '' : 'INSERT OR'} REPLACE INTO
                     ${tableName}
                     (${columnNames})
                     VALUES ${questMarks};
-                `, { dialect: this[_formatDialect]! });
+                `, { dialect: formatDialects[option!.dbType!] });
                 sqls.push({ sql, params });
                 break;
             }
@@ -2544,9 +2935,28 @@ export class SqlService<T extends object> {
                             if (V === null) {
                                 const field = this[_fields]![column];
                                 if (field?.uuid) {
-                                    questMark.push('UUID()');
-                                } else if (field?.uuidShort && this[_dbType] === DBType.Mysql) {
-                                    questMark.push('UUID_SHORT()');
+                                    switch (option.dbType) {
+                                        case DBType.Postgresql:
+                                            questMark.push('gen_random_uuid()');
+                                            break;
+                                        default:
+                                            questMark.push('UUID()');
+                                            break;
+                                    }
+                                } else if (field?.uuidShort) {
+                                    switch (option.dbType) {
+                                        case DBType.Postgresql:
+                                            questMark.push(`encode(uuid_send(gen_random_uuid()::uuid),'base64')`);
+                                            break;
+                                        case DBType.Mysql:
+                                            questMark.push('UUID_SHORT()');
+                                            break;
+                                        default:
+                                            questMark.push('?');
+                                            params.push(V);
+                                            break;
+
+                                    }
                                 } else {
                                     questMark.push('?');
                                     params.push(V);
@@ -2564,14 +2974,13 @@ export class SqlService<T extends object> {
                     ${tableName}
                     (${columnNames})
                     VALUES ${questMarks};
-                `, { dialect: this[_formatDialect]! });
-
+                `, { dialect: formatDialects[option!.dbType!] });
                 sqls.push({ sql, params });
                 break;
             }
             case InsertMode.InsertWithTempTable: {
                 const tableTemp = `${option?.tableName}_${Math.random()}`.replace(/\./, '');
-                const tableTempESC = Sqlstring.escapeId(tableTemp);
+                const tableTempESC = tableTemp;
                 sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
                 const finalColumns = new Set<string>();
                 const params: any[] = [];
@@ -2588,9 +2997,28 @@ export class SqlService<T extends object> {
                             if (V === null) {
                                 const field = this[_fields]![column];
                                 if (field?.uuid) {
-                                    questMark.push('UUID()');
-                                } else if (field?.uuidShort && this[_dbType] === DBType.Mysql) {
-                                    questMark.push('UUID_SHORT()');
+                                    switch (option.dbType) {
+                                        case DBType.Postgresql:
+                                            questMark.push('gen_random_uuid()');
+                                            break;
+                                        default:
+                                            questMark.push('UUID()');
+                                            break;
+                                    }
+                                } else if (field?.uuidShort) {
+                                    switch (option.dbType) {
+                                        case DBType.Postgresql:
+                                            questMark.push(`encode(uuid_send(gen_random_uuid()::uuid),'base64')`);
+                                            break;
+                                        case DBType.Mysql:
+                                            questMark.push('UUID_SHORT()');
+                                            break;
+                                        default:
+                                            questMark.push('?');
+                                            params.push(V);
+                                            break;
+
+                                    }
                                 } else {
                                     questMark.push('?');
                                     params.push(V);
@@ -2611,16 +3039,17 @@ export class SqlService<T extends object> {
                         ${tableTemp}
                         (${columnNames})
                         VALUES ${questMarks};
-                    `, { dialect: this[_formatDialect]! }), params
+                    `, { dialect: formatDialects[option!.dbType!] }), params
                 });
                 sqls.push({
-                    sql: formatDialect(`INSERT INTO ${Sqlstring.escapeId(option.tableName)} (${columnNames})
-                        SELECT ${columnNames} FROM ${tableTemp};`, { dialect: this[_formatDialect]! })
+                    sql: formatDialect(`INSERT INTO ${option.tableName} (${columnNames})
+                        SELECT ${columnNames} FROM ${tableTemp};`, { dialect: formatDialects[option!.dbType!] })
                 });
                 sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
                 break;
             }
         }
+
         return sqls;
     }
     /**
@@ -2670,7 +3099,7 @@ export class SqlService<T extends object> {
                         let result = 0n;
                         for (const { sql, params } of sqls) {
                             const dd = option!.conn!.execute(SyncMode.Sync, sql, params);
-                            if (dd.insertId) { result += dd.insertId; }
+                            if (dd.insertId) { result += BigInt(dd.insertId); }
                         }
                         return result;
                     },
@@ -2679,7 +3108,7 @@ export class SqlService<T extends object> {
                 if (isArray) return result;
                 else return result[0]!;
             };
-            if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option!.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
                 return fn();
             } else {
                 return option?.dao?.transaction(SyncMode.Sync, fn, option?.conn)!;
@@ -2694,7 +3123,7 @@ export class SqlService<T extends object> {
                         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; }
+                            if (dd.insertId) { result += BigInt(dd.insertId); }
                         }
                         return result;
                     },
@@ -2703,22 +3132,11 @@ export class SqlService<T extends object> {
                 return result;
             };
 
-            if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option!.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
                 return fn();
             } else {
                 return option?.dao?.transaction(SyncMode.Async, fn, option?.conn) as Promise<bigint[]>;
             }
-            // return new Promise<bigint[]>(async (resolve, reject) => {
-            //     try {
-            //         if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
-            //             resolve((await fn())!);
-            //         } else {
-            //             await option?.dao?.transaction(SyncMode.Async, async () => resolve((await fn())!), option?.conn);
-            //         }
-            //     } catch (error) {
-            //         reject(error);
-            //     }
-            // });
         } else {
             const fn = async () => {
                 const result = await excuteSplit<Partial<T>, bigint>(
@@ -2737,28 +3155,17 @@ export class SqlService<T extends object> {
                 );
                 return result[0]!;
             };
-            if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option!.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
                 return fn();
             } else {
                 return option?.dao?.transaction(SyncMode.Async, fn, option?.conn) as Promise<bigint>;
             }
-            // return new Promise<bigint>(async (resolve, reject) => {
-            //     try {
-            //         if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
-            //             resolve((await fn())!);
-            //         } else {
-            //             await option?.dao?.transaction(SyncMode.Async, async () => resolve((await fn())!), option?.conn);
-            //         }
-            //     } catch (error) {
-            //         reject(error);
-            //     }
-            // });
         }
     }
 
     private _update(datas: Array<Partial<T>>, option: MethodOption): { sql: string; params?: any[] }[] {
         const sqls: { sql: string; params?: any[] }[] = [];
-        const tableName = Sqlstring.escapeId(option?.tableName);
+        const tableName = option?.tableName;
         const where = `WHEN ${iterare(this[_ids]!).map(c => `${this[_fields]![c]?.C2()} = ?`).join(' AND ')} THEN ?`;
         const columnMaps: Record<string, {
             where: string[];
@@ -2790,7 +3197,7 @@ export class SqlService<T extends object> {
                 params.push(...columnMaps[K]!.params);
                 return `${this[_fields]![K]?.C2()} = CASE ${columnMaps[K]!.where.join(' ')} ELSE ${this[_fields]![K]?.C2()} END`
             })
-            .join(',')};`, { dialect: this[_formatDialect]! });
+            .join(',')};`, { dialect: formatDialects[option!.dbType!] });
         sqls.push({ sql, params });
         return sqls;
     }
@@ -2836,7 +3243,7 @@ export class SqlService<T extends object> {
                 );
                 return result.reduce((a, b) => a + b);
             };
-            if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option!.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
                 return fn();
             } else {
                 return option?.dao?.transaction(SyncMode.Sync, fn, option?.conn)!;
@@ -2859,23 +3266,11 @@ export class SqlService<T extends object> {
                 );
                 return result.reduce((a, b) => a + b);
             };
-            if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option!.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
                 return fn();
             } else {
                 return option?.dao?.transaction(SyncMode.Async, fn, option?.conn) as Promise<number>;
             }
-
-            return new Promise<number>(async (resolve, reject) => {
-                try {
-                    if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
-                        resolve((await fn())!);
-                    } else {
-                        await option?.dao?.transaction(SyncMode.Async, async () => resolve((await fn())!), option?.conn);
-                    }
-                } catch (error) {
-                    reject(error);
-                }
-            });
         }
     }
 
@@ -2917,8 +3312,8 @@ export class SqlService<T extends object> {
 
         option.mode ??= DeleteMode.Common;
         const tableTemp = `${option?.tableName}_${Math.random()}`.replace(/\./, '');
-        const tableTempESC = Sqlstring.escapeId(tableTemp);
-        const tableNameESC = Sqlstring.escapeId(option?.tableName);
+        const tableTempESC = tableTemp;
+        const tableNameESC = option?.tableName;
 
         if (option.id) {
             const idName = this[_ids]![0]!;
@@ -2945,27 +3340,27 @@ export class SqlService<T extends object> {
                     sql: formatDialect(`
                     UPDATE ${tableNameESC} SET ${this[_fields]![this[_stateFileName]]?.C2()} = ?
                     WHERE ${whereSql};
-                `, { dialect: this[_formatDialect]! }), params
+                `, { dialect: formatDialects[option!.dbType!] }), params
                 });
             } else {
-                sqls.push({ sql: formatDialect(`DELETE FROM ${tableNameESC} WHERE ${whereSql};`, { dialect: this[_formatDialect]! }), params });
+                sqls.push({ sql: formatDialect(`DELETE FROM ${tableNameESC} WHERE ${whereSql};`, { dialect: formatDialects[option!.dbType!] }), params });
             }
         } else {
             sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
             const delWhere = Object.keys(wheres[0] as unknown as any);
             const _sqls = this._createTable({ tableName: tableTemp, temp: true, columns: delWhere, data: wheres, index: 'all', id: 'none' })!;
             sqls.push(..._sqls);
-            switch (this[_dbType]) {
+            switch (option!.dbType) {
                 case DBType.Mysql: {
                     if (this[_stateFileName] !== undefined && option.forceDelete !== true) {
                         sqls.push({
                             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]! }),
+                            SET a.${this[_fields]![this[_stateFileName]]?.C2()} = ?;`, { dialect: formatDialects[option!.dbType!] }),
                             params: [this[_deleteState]]
                         });
                     } else {
                         sqls.push({
-                            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]! })
+                            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: formatDialects[option!.dbType!] })
                         });
                     }
                     break;
@@ -2976,11 +3371,11 @@ export class SqlService<T extends object> {
                     if (this[_stateFileName] !== undefined && option.forceDelete !== true) {
                         sqls.push({
                             sql: formatDialect(`UPDATE ${tableNameESC} SET ${this[_fields]![this[_stateFileName]]?.C2()} = ?
-                            WHERE (${columnNames}) IN (SELECT ${columnNames} FROM ${tableTempESC});`, { dialect: this[_formatDialect]! }),
+                            WHERE (${columnNames}) IN (SELECT ${columnNames} FROM ${tableTempESC});`, { dialect: formatDialects[option!.dbType!] }),
                             params: [this[_deleteState]]
                         });
                     } else {
-                        sqls.push({ sql: formatDialect(`DELETE FROM ${tableNameESC} WHERE (${columnNames}) IN (SELECT ${columnNames} FROM ${tableTempESC});`, { dialect: this[_formatDialect]! }) });
+                        sqls.push({ sql: formatDialect(`DELETE FROM ${tableNameESC} WHERE (${columnNames}) IN (SELECT ${columnNames} FROM ${tableTempESC});`, { dialect: formatDialects[option!.dbType!] }) });
                     }
                     break;
                 }
@@ -2997,7 +3392,7 @@ export class SqlService<T extends object> {
                 }
                 return result;
             };
-            if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option!.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
                 return fn();
             } else {
                 return option?.dao?.transaction(SyncMode.Sync, fn, option?.conn)!;
@@ -3011,22 +3406,11 @@ export class SqlService<T extends object> {
                 }
                 return result;
             };
-            if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option!.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
                 return fn();
             } else {
                 return option?.dao?.transaction<number>(SyncMode.Async, fn, option?.conn) as Promise<number>;
             }
-            // return new Promise<number>(async (resolve, reject) => {
-            //     try {
-            //         if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
-            //             resolve((await fn())!);
-            //         } else {
-            //             await option?.dao?.transaction(SyncMode.Async, async () => resolve((await fn())!), option?.conn);
-            //         }
-            //     } catch (error) {
-            //         reject(error);
-            //     }
-            // });
         }
     }
 
@@ -3095,8 +3479,8 @@ export class SqlService<T extends object> {
         option.templateResult ??= TemplateResult.AssertOne;
         option.error ??= 'error data!';
         const tableTemp = `${option?.tableName}_${Math.random()}`.replace(/\./, '');
-        const tableTempESC = Sqlstring.escapeId(tableTemp);
-        const tableNameESC = Sqlstring.escapeId(option?.tableName);
+        const tableTempESC = tableTemp;
+        const tableNameESC = option?.tableName;
 
         if (option.id) {
             const idName = this[_ids]![0]!;
@@ -3115,7 +3499,7 @@ export class SqlService<T extends object> {
                     params.push(V);
                     return `${this[_fields]![K]?.C2()} = ?`;
                 }).join(' AND ')}`;
-            }).join(' UNION ALL '), { dialect: this[_formatDialect]! });
+            }).join(' UNION ALL '), { dialect: formatDialects[option!.dbType!] });
             sqls.push({ sql: whereSql, params });
             resultIndex = 0;
         } else {
@@ -3124,7 +3508,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: 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: 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: formatDialects[option!.dbType!] }) });
             sqls.push({ sql: `DROP TABLE IF EXISTS ${tableTempESC};` });
         }
 
@@ -3296,7 +3680,7 @@ export class SqlService<T extends object> {
                 return '?';
             }
             return txt;
-        })!, { dialect: this[_formatDialect]! });
+        })!, { dialect: formatDialects[option!.dbType!] });
         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);
@@ -3354,7 +3738,7 @@ export class SqlService<T extends object> {
                 return '?';
             }
             return txt;
-        })!, { dialect: this[_formatDialect]! });
+        })!, { dialect: formatDialects[option!.dbType!] });
         if (option.sync === SyncMode.Sync) {
             const result = option!.conn!.execute(SyncMode.Sync, sql, params);
             return result.affectedRows;
@@ -3569,9 +3953,9 @@ export class SqlService<T extends object> {
     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);
+        const tableES = option!.tableName;
         option!.force ??= false;
-        if (this[_dbType] === DBType.Sqlite) {
+        if (option!.dbType === DBType.Sqlite) {
             if (option?.force) {
                 option!.conn!.execute(SyncMode.Sync, `DROP TABLE IF EXISTS ${tableES};`);
             }
@@ -3585,10 +3969,10 @@ export class SqlService<T extends object> {
                     // 更新版本
                     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))
+                        .map(c => c.name)
                         .join(',');
 
-                    const rtable = Sqlstring.escapeId(`${option!.tableName}_${tableVersion.replace(/\./, '_')}`);
+                    const rtable = `${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, `
@@ -3599,7 +3983,7 @@ export class SqlService<T extends object> {
                     `);
                     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, `CREATE INDEX ${`${index}_${Math.random()}`.replace(/\./, '')} ON ${tableES} ("${this[_fields]![index]?.C2()}");`);
                         }
                     }
                     option!.conn!.execute(SyncMode.Sync, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
@@ -3621,12 +4005,12 @@ export class SqlService<T extends object> {
                 `);
                 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, `CREATE INDEX ${`${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) {
+        } else if (option!.dbType === DBType.SqliteRemote) {
 
             return new Promise(async (resolve, reject) => {
                 try {
@@ -3643,7 +4027,7 @@ export class SqlService<T extends object> {
                             // 更新版本
                             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))
+                                .map(c => c.name)
                                 .join(',');
 
                             const rtable = `${option!.tableName}_${tableVersion.replace(/\./, '_')}`;
@@ -3657,7 +4041,7 @@ export class SqlService<T extends object> {
                         `);
                             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, `CREATE INDEX ${`${index}_${Math.random()}`.replace(/\./, '')} ON ${tableES} ("${this[_fields]![index]?.C2()}");`);
                                 }
                             }
                             await option!.conn!.execute(SyncMode.Async, `INSERT INTO ${tableES} (${columns}) SELECT ${columns} FROM ${rtable};`);
@@ -3678,7 +4062,7 @@ export class SqlService<T extends object> {
                     `);
                         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, `CREATE INDEX ${`${index}_${Math.random()}`.replace(/\./, '')} ON ${option!.tableName} ("${this[_fields]![index]?.C2()}");`);
                             }
                         }
                         await option!.conn!.execute(SyncMode.Async, 'INSERT OR REPLACE INTO TABLE_VERSION (______tableName, ______version ) VALUES ( ?, ? )', [option!.tableName, lastVersion]);
@@ -3695,8 +4079,7 @@ export class SqlService<T extends object> {
     close(option: MethodOption & { sync: SyncMode.Sync; }): void;
     @P<T>()
     close(option?: MethodOption & { sync?: SyncMode; force?: boolean }): void | Promise<void> {
-        const dbName = option?.dbName ?? this[_daoDBName] ?? _primaryDB;
-        delete globalThis[_dao][this[_dbType]!][dbName];
+        delete globalThis[_dao][option!.dbType][option!.dbName];
         if (option?.sync === SyncMode.Async) {
             return option!.dao!.close(SyncMode.Async);
         } else if (option?.sync === SyncMode.Sync) {
@@ -3716,13 +4099,14 @@ export class SqlService<T extends object> {
     4. 自定义字段名称：字符串数组
     ** `index` 表的索引，设置方式同ID
      */
-    private _createTable<L = T>({ tableName, temp = true, columns, data, id = 'auto', index = 'auto' }: {
+    private _createTable<L = T>({ tableName, temp = true, columns, data, id = 'auto', index = 'auto', dbType }: {
         tableName?: string;
         temp?: boolean,
         columns?: string[];
         data?: Array<Partial<L>>;
         id?: 'auto' | 'all' | 'none' | string[];
         index?: 'auto' | 'all' | 'none' | string[];
+        dbType?: DBType;
     } = {}): { sql: string; params?: any[] }[] {
         const sqls: { sql: string; params?: any[] }[] = [];
         columns = columns || this[_columns]!;
@@ -3746,14 +4130,14 @@ export class SqlService<T extends object> {
         } else {
             indexs = index;
         }
-        tableName = Sqlstring.escapeId(tableName ?? this[_tableName]);
-        switch (this[_dbType]) {
+        tableName = tableName ?? this[_tableName];
+        switch (dbType) {
             case DBType.Mysql: {
                 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;`, { dialect: this[_formatDialect]! });
+                ) ENGINE=MEMORY;`, { dialect: mysql });
                 sqls.push({ sql });
                 if (data && data.length > 0) {
                     const params: any[] = [];
@@ -3766,7 +4150,7 @@ export class SqlService<T extends object> {
                         }).join(',')}`;
                         first = false;
                         return r;
-                    }).join(' UNION ALL ')}`, { dialect: this[_formatDialect]! });
+                    }).join(' UNION ALL ')}`, { dialect: mysql });
                     sqls.push({ sql, params });
                 }
                 break;
@@ -3776,11 +4160,11 @@ export class SqlService<T extends object> {
                 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]! });
+                );`, { dialect: sqlite });
                 sqls.push({ sql });
                 if (indexs) {
                     for (const index of indexs) {
-                        sql = formatDialect(`CREATE INDEX ${Sqlstring.escapeId(`${index}_${Math.random()}`.replace(/\./, ''))} ON ${tableName} (${this[_fields]![index]?.C2()});`, { dialect: this[_formatDialect]! });
+                        sql = formatDialect(`CREATE INDEX ${`${index}_${Math.random()}`.replace(/\./, '')} ON ${tableName} (${this[_fields]![index]?.C2()});`, { dialect: sqlite });
                         sqls.push({ sql });
                     }
                 }
@@ -3795,7 +4179,7 @@ export class SqlService<T extends object> {
                         }).join(',')}`;
                         first = false;
                         return r;
-                    }).join(' UNION ALL ')}`, { dialect: this[_formatDialect]! });
+                    }).join(' UNION ALL ')}`, { dialect: sqlite });
                     sqls.push({ sql, params });
                 }
                 break;