baja-lite 1.0.26 → 1.0.29

package/es/sql.js

@@ -7,11 +7,10 @@ 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 _b, _c, _d;
-var _e, _f, _g, _h;
+var _b, _c, _d, _e;
+var _f, _g, _h, _j;
 import { Throw } from './error';
 import tslib from 'tslib';
-import Sqlstring from 'sqlstring';
 import iterare from 'iterare';
 import { emptyString } from './string';
 import pino from 'pino';
@@ -19,7 +18,7 @@ import { excuteSplit, ExcuteSplitMode, sleep } from './fn';
 import { add, calc, ten2Any } from './math';
 import mustache from 'mustache';
 import { C2P, C2P2, P2C } from './object';
-import { formatDialect, sqlite, mysql } from 'sql-formatter';
+import { formatDialect, sqlite, mysql, postgresql } from 'sql-formatter';
 import HTML from 'html-parse-stringify';
 import { convert } from './convert-xml';
 import { ArrayList } from './list';
@@ -72,7 +71,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');
@@ -99,11 +97,12 @@ globalThis[_resultMap_SQLID] = {};
 export var DBType;
 (function (DBType) {
     DBType[DBType["Mysql"] = 0] = "Mysql";
-    DBType[DBType["Sqlite"] = 1] = "Sqlite";
-    DBType[DBType["Mongo"] = 2] = "Mongo";
-    DBType[DBType["SqliteRemote"] = 3] = "SqliteRemote";
-    DBType[DBType["Redis"] = 4] = "Redis";
-    DBType[DBType["RedisLock"] = 5] = "RedisLock";
+    DBType[DBType["Postgresql"] = 1] = "Postgresql";
+    DBType[DBType["Sqlite"] = 2] = "Sqlite";
+    DBType[DBType["Mongo"] = 3] = "Mongo";
+    DBType[DBType["SqliteRemote"] = 4] = "SqliteRemote";
+    DBType[DBType["Redis"] = 5] = "Redis";
+    DBType[DBType["RedisLock"] = 6] = "RedisLock";
 })(DBType || (DBType = {}));
 ;
 export var MapperIfUndefined;
@@ -239,17 +238,7 @@ export var SqlType;
     SqlType[SqlType["mediumtext"] = 20] = "mediumtext";
     SqlType[SqlType["longblob"] = 21] = "longblob";
     SqlType[SqlType["longtext"] = 22] = "longtext";
-    SqlType[SqlType["set"] = 23] = "set";
-    SqlType[SqlType["enum"] = 24] = "enum";
-    SqlType[SqlType["json"] = 25] = "json";
-    SqlType[SqlType["geometry"] = 26] = "geometry";
-    SqlType[SqlType["point"] = 27] = "point";
-    SqlType[SqlType["linestring"] = 28] = "linestring";
-    SqlType[SqlType["polygon"] = 29] = "polygon";
-    SqlType[SqlType["multipoint"] = 30] = "multipoint";
-    SqlType[SqlType["multilinestring"] = 31] = "multilinestring";
-    SqlType[SqlType["multipolygon"] = 32] = "multipolygon";
-    SqlType[SqlType["geometrycollection"] = 33] = "geometrycollection";
+    SqlType[SqlType["json"] = 23] = "json";
 })(SqlType || (SqlType = {}));
 export var ColumnMode;
 (function (ColumnMode) {
@@ -281,7 +270,7 @@ class MysqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql, params));
+            logger.trace(sql, params);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -314,7 +303,7 @@ class MysqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql, params));
+            logger.trace(sql, params);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -350,7 +339,7 @@ class MysqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql, params));
+            logger.trace(sql, params);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -384,7 +373,7 @@ class MysqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql, params));
+            logger.trace(sql, params);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -418,7 +407,7 @@ class MysqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql, params));
+            logger.trace(sql, params);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -454,6 +443,11 @@ export class Mysql {
     constructor(pool) {
         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) {
         if (sync === SyncMode.Sync) {
             logger.error('MYSQL not suppouted sync mode');
@@ -538,11 +532,310 @@ export class Mysql {
     restore(sync, name) {
     }
 }
-class SqliteConnection {
+class PostgresqlConnection {
     constructor(conn) {
         this[_c] = false;
         this[_daoConnection] = conn;
     }
+    execute(sync, sql, params) {
+        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(async (resolve, reject) => {
+            try {
+                let index = 1;
+                const { rowCount } = await this[_daoConnection].query({
+                    text: sql.replace(/\?/g, () => `$${index++}`),
+                    values: params
+                });
+                const result = rowCount;
+                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(sync, sql, params) {
+        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(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);
+                }
+                resolve(null);
+            }
+            catch (error) {
+                logger.error(`
+                    error: ${error},
+                    sql: ${sql},
+                    params: ${params}
+                `);
+                reject(error);
+            }
+        });
+    }
+    get(sync, sql, params) {
+        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(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]);
+                resolve(null);
+            }
+            catch (error) {
+                logger.error(`
+                    error: ${error},
+                    sql: ${sql},
+                    params: ${params}
+                `);
+                reject(error);
+            }
+        });
+    }
+    raw(sync, sql, params) {
+        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(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) => Object.values(i)[0]));
+                resolve([]);
+            }
+            catch (error) {
+                logger.error(`
+                    error: ${error},
+                    sql: ${sql},
+                    params: ${params}
+                `);
+                reject(error);
+            }
+        });
+    }
+    query(sync, sql, params) {
+        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(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) {
+        if (sync === SyncMode.Sync) {
+            try {
+                this[_daoConnection]?.release();
+            }
+            catch (error) {
+            }
+        }
+        ;
+    }
+}
+_c = _inTransaction;
+export class Postgresql {
+    constructor(pool) {
+        this[_daoDB] = pool;
+    }
+    async keepAlive() {
+        const connection = await this[_daoDB].connect();
+        connection.query('SELECT 1');
+        setTimeout(async () => await this.keepAlive(), 60000);
+    }
+    createConnection(sync) {
+        if (sync === SyncMode.Sync) {
+            logger.error('Postgresql not suppouted sync mode');
+            return null;
+        }
+        ;
+        return new Promise(async (resolve, reject) => {
+            try {
+                const connection = await this[_daoDB].connect();
+                logger.debug('create new connection!');
+                resolve(new PostgresqlConnection(connection));
+            }
+            catch (error) {
+                reject(error);
+            }
+        });
+    }
+    transaction(sync, fn, conn) {
+        if (sync === SyncMode.Sync) {
+            logger.warn('Postgresql not suppouted sync mode');
+            return null;
+        }
+        ;
+        return new Promise(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) {
+        if (sync === SyncMode.Sync) {
+            this[_daoDB]?.end();
+        }
+        ;
+    }
+    backup(sync, name) {
+    }
+    remove(sync) {
+    }
+    restore(sync, name) {
+    }
+}
+class SqliteConnection {
+    constructor(conn) {
+        this[_d] = false;
+        this[_daoConnection] = conn;
+    }
     execute(sync, sql, params) {
         try {
             logger.debug(sql, params ?? '');
@@ -556,7 +849,7 @@ class SqliteConnection {
             }
             ;
             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') {
@@ -587,7 +880,7 @@ class SqliteConnection {
             }
             ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(Sqlstring.format(sql, params));
+                logger.trace(sql, params);
             }
             return this[_daoConnection].prepare(sql).pluck().get(params ?? {});
         }
@@ -612,7 +905,7 @@ class SqliteConnection {
             }
             ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(Sqlstring.format(sql, params));
+                logger.trace(sql, params);
             }
             return this[_daoConnection].prepare(sql).get(params ?? {});
         }
@@ -638,7 +931,7 @@ class SqliteConnection {
             }
             ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(Sqlstring.format(sql, params));
+                logger.trace(sql, params);
             }
             return this[_daoConnection].prepare(sql).raw().all(params ?? {});
         }
@@ -664,7 +957,7 @@ class SqliteConnection {
             }
             ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(Sqlstring.format(sql, params));
+                logger.trace(sql, params);
             }
             return this[_daoConnection].prepare(sql).all(params ?? {});
         }
@@ -680,7 +973,7 @@ class SqliteConnection {
     realse(sync) {
     }
 }
-_c = _inTransaction;
+_d = _inTransaction;
 export class Sqlite {
     constructor(db) {
         this[_daoDB] = db;
@@ -745,7 +1038,7 @@ export class Sqlite {
 }
 export class SqliteRemoteConnection {
     constructor(conn, name) {
-        this[_d] = false;
+        this[_e] = false;
         this[_daoConnection] = conn;
         this[_sqliteRemoteName] = name;
     }
@@ -761,7 +1054,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql, params));
+            logger.trace(sql, params);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -791,7 +1084,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql, params));
+            logger.trace(sql, params);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -821,7 +1114,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql, params));
+            logger.trace(sql, params);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -851,7 +1144,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql, params));
+            logger.trace(sql, params);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -881,7 +1174,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(Sqlstring.format(sql, params));
+            logger.trace(sql, params);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -902,7 +1195,7 @@ export class SqliteRemoteConnection {
     realse(sync) {
     }
 }
-_d = _inTransaction;
+_e = _inTransaction;
 export class SqliteRemote {
     constructor(db, name) {
         this[_daoDB] = db;
@@ -1260,10 +1553,10 @@ function replaceCdata(rawText) {
     return rawText;
 }
 function _flatData(result, i, length, keys, V) {
-    var _e;
+    var _f;
     const key = keys[i];
     if (i < length) {
-        result[_e = key] ?? (result[_e] = {});
+        result[_f = key] ?? (result[_f] = {});
         i++;
         _flatData(result[key], i, length, keys, V);
     }
@@ -1496,15 +1789,16 @@ function P(skipConn = false) {
             const option = args[0] = Object.assign({}, globalThis[_GlobalSqlOption], this[_SqlOption], args[0]);
             option.sync ?? (option.sync = SyncMode.Async);
             option.tableName = option?.tableName ?? this[_tableName];
-            const dbName = option?.dbName ?? this[_daoDBName] ?? _primaryDB;
-            option.dao = globalThis[_dao][this[_dbType]][dbName];
-            if (this[_dbType] === DBType.Sqlite) {
+            option.dbName = option?.dbName ?? this[_daoDBName] ?? _primaryDB;
+            option.dbType = this[_dbType] ?? globalThis[_GlobalSqlOption].dbType ?? DBType.Mysql;
+            option.dao = globalThis[_dao][option.dbType][option.dbName];
+            if (option.dbType === DBType.Sqlite) {
                 if (!option.dao) {
-                    const db = new Sqlite(new globalThis[_GlobalSqlOption].BetterSqlite3(dbName, { 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, { 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;
                 }
                 Throw.if(option.sync === SyncMode.Async, 'sqlite can not Async!');
@@ -1538,14 +1832,14 @@ function P(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);
-                    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);
+                    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;
                 }
                 Throw.if(option.sync === SyncMode.Sync, 'SqliteRemote remote can not sync!');
@@ -1577,8 +1871,38 @@ function P(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 {
                         // 连接共享
@@ -1650,204 +1974,182 @@ const FieldFilter = (K, V, def, uuidColumn, option) => {
     return [ret, V];
 };
 const MYSQLCHARSET = `CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci`;
+const POSTGRESCHARSET = `COLLATE "pg_catalog"."default"`;
 export const Field = (config) => {
     config.type ?? (config.type = SqlType.varchar);
     return (object, propertyName) => {
         const field = config;
         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) => 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) => 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) => 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) => 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) => 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) => 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;
             }
@@ -1901,11 +2203,12 @@ export const Field = (config) => {
 const formatDialects = {
     [DBType.Mysql]: mysql,
     [DBType.Sqlite]: sqlite,
-    [DBType.SqliteRemote]: sqlite
+    [DBType.SqliteRemote]: sqlite,
+    [DBType.Postgresql]: postgresql,
 };
 export const DB = (config) => {
     return function (constructor) {
-        var _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
+        var _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);
@@ -1915,21 +2218,19 @@ export const DB = (config) => {
         const __deleteState = Reflect.getMetadata(_deleteState, config.clz.prototype);
         const __index = Reflect.getMetadata(_index, config.clz.prototype);
         const __def = Reflect.getMetadata(_def, config.clz.prototype);
-        const __dbType = config.dbType ?? DBType.Mysql;
-        const __formatDialect = formatDialects[__dbType];
+        const __dbType = config.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 _0 = class extends constructor {
                 constructor() {
                     super(...arguments);
-                    this[_e] = config.tableName;
-                    this[_f] = className;
-                    this[_g] = ClassName;
-                    this[_h] = vueName;
-                    this[_j] = config.dbName;
-                    this[_k] = __dbType;
-                    this[_l] = __formatDialect;
+                    this[_f] = config.tableName;
+                    this[_g] = className;
+                    this[_h] = ClassName;
+                    this[_j] = vueName;
+                    this[_k] = config.dbName;
+                    this[_l] = __dbType;
                     this[_m] = config.sqliteVersion;
                     this[_o] = Object.assign({}, _defOption, config);
                     this[_p] = __ids;
@@ -1964,13 +2265,12 @@ export const DB = (config) => {
                     };
                 }
             },
-            _e = _tableName,
-            _f = _className,
-            _g = _ClassName,
-            _h = _vueName,
-            _j = _daoDBName,
-            _k = _dbType,
-            _l = _formatDialect,
+            _f = _tableName,
+            _g = _className,
+            _h = _ClassName,
+            _j = _vueName,
+            _k = _daoDBName,
+            _l = _dbType,
             _m = _sqlite_version,
             _o = _SqlOption,
             _p = _ids,
@@ -2032,7 +2332,7 @@ export function DeclareService(clz, config) {
 export class SqlService {
     _insert(datas, option) {
         const sqls = [];
-        const tableName = Sqlstring.escapeId(option.tableName);
+        const tableName = option.tableName;
         switch (option?.mode) {
             case InsertMode.InsertIfNotExists: {
                 const conditions = option.existConditionOtherThanIds || this[_ids];
@@ -2055,10 +2355,28 @@ export class SqlService {
                         if (V === null) {
                             const field = this[_fields][column];
                             if (field?.uuid) {
-                                questMark.push('UUID()');
+                                switch (option.dbType) {
+                                    case DBType.Postgresql:
+                                        questMark.push('gen_random_uuid()');
+                                        break;
+                                    default:
+                                        questMark.push('UUID()');
+                                        break;
+                                }
                             }
-                            else if (field?.uuidShort && this[_dbType] === DBType.Mysql) {
-                                questMark.push('UUID_SHORT()');
+                            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('?');
@@ -2083,7 +2401,7 @@ export class SqlService {
                 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;
             }
@@ -2103,10 +2421,28 @@ export class SqlService {
                         if (V === null) {
                             const field = this[_fields][column];
                             if (field?.uuid) {
-                                questMark.push('UUID()');
+                                switch (option.dbType) {
+                                    case DBType.Postgresql:
+                                        questMark.push('gen_random_uuid()');
+                                        break;
+                                    default:
+                                        questMark.push('UUID()');
+                                        break;
+                                }
                             }
-                            else if (field?.uuidShort && this[_dbType] === DBType.Mysql) {
-                                questMark.push('UUID_SHORT()');
+                            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('?');
@@ -2122,11 +2458,11 @@ export class SqlService {
                 });
                 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;
             }
@@ -2146,10 +2482,28 @@ export class SqlService {
                         if (V === null) {
                             const field = this[_fields][column];
                             if (field?.uuid) {
-                                questMark.push('UUID()');
+                                switch (option.dbType) {
+                                    case DBType.Postgresql:
+                                        questMark.push('gen_random_uuid()');
+                                        break;
+                                    default:
+                                        questMark.push('UUID()');
+                                        break;
+                                }
                             }
-                            else if (field?.uuidShort && this[_dbType] === DBType.Mysql) {
-                                questMark.push('UUID_SHORT()');
+                            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('?');
@@ -2169,13 +2523,13 @@ export class SqlService {
                     ${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();
                 const params = [];
@@ -2192,10 +2546,28 @@ export class SqlService {
                         if (V === null) {
                             const field = this[_fields][column];
                             if (field?.uuid) {
-                                questMark.push('UUID()');
+                                switch (option.dbType) {
+                                    case DBType.Postgresql:
+                                        questMark.push('gen_random_uuid()');
+                                        break;
+                                    default:
+                                        questMark.push('UUID()');
+                                        break;
+                                }
                             }
-                            else if (field?.uuidShort && this[_dbType] === DBType.Mysql) {
-                                questMark.push('UUID_SHORT()');
+                            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('?');
@@ -2218,11 +2590,11 @@ export class SqlService {
                         ${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;
@@ -2242,7 +2614,7 @@ export class SqlService {
                     for (const { sql, params } of sqls) {
                         const dd = option.conn.execute(SyncMode.Sync, sql, params);
                         if (dd.insertId) {
-                            result += dd.insertId;
+                            result += BigInt(dd.insertId);
                         }
                     }
                     return result;
@@ -2252,7 +2624,7 @@ export class SqlService {
                 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 {
@@ -2267,30 +2639,19 @@ export class SqlService {
                     for (const { sql, params } of sqls) {
                         const dd = await option.conn.execute(SyncMode.Async, sql, params);
                         if (dd.insertId) {
-                            result += dd.insertId;
+                            result += BigInt(dd.insertId);
                         }
                     }
                     return result;
                 }, { everyLength: option?.every === true ? 1 : option?.maxDeal });
                 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);
             }
-            // 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 () => {
@@ -2307,28 +2668,17 @@ export class SqlService {
                 }, { everyLength: 1 });
                 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);
             }
-            // 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);
-            //     }
-            // });
         }
     }
     _update(datas, option) {
         const sqls = [];
-        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 = Object.fromEntries(this[_columnsNoId].map(c => [c, {
                 where: new Array(),
@@ -2355,7 +2705,7 @@ export class SqlService {
             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;
     }
@@ -2377,7 +2727,7 @@ export class SqlService {
                 }, { everyLength: option?.maxDeal });
                 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 {
@@ -2399,25 +2749,12 @@ export class SqlService {
                 }, { everyLength: option?.maxDeal });
                 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);
             }
-            return new Promise(async (resolve, reject) => {
-                try {
-                    if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
-                        resolve((await fn()));
-                    }
-                    else {
-                        await option?.dao?.transaction(SyncMode.Async, async () => resolve((await fn())), option?.conn);
-                    }
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
         }
     }
     delete(option) {
@@ -2428,8 +2765,8 @@ export class SqlService {
         Throw.if(!!option.id && !!option.where, 'id and where only one can set!');
         option.mode ?? (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];
             const ids = option.id instanceof Array ? option.id : [option.id];
@@ -2453,11 +2790,11 @@ export class SqlService {
                     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 {
@@ -2465,18 +2802,18 @@ export class SqlService {
             const delWhere = Object.keys(wheres[0]);
             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;
@@ -2487,12 +2824,12 @@ export class SqlService {
                     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;
                 }
@@ -2508,7 +2845,7 @@ export class SqlService {
                 }
                 return result;
             };
-            if (this[_dbType] === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
+            if (option.dbType === DBType.SqliteRemote || option?.conn?.[_inTransaction] === true) {
                 return fn();
             }
             else {
@@ -2524,23 +2861,12 @@ export class SqlService {
                 }
                 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);
             }
-            // 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);
-            //     }
-            // });
         }
     }
     _template(templateResult, result, error) {
@@ -2573,8 +2899,8 @@ export class SqlService {
         option.templateResult ?? (option.templateResult = TemplateResult.AssertOne);
         option.error ?? (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];
             const ids = option.id instanceof Array ? option.id : [option.id];
@@ -2592,7 +2918,7 @@ export class SqlService {
                     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;
         }
@@ -2602,7 +2928,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: 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};` });
         }
         if (option.sync === SyncMode.Sync) {
@@ -2750,7 +3076,7 @@ export class SqlService {
                 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(option.selectResult, result, option.defValue, option.errorMsg, option.hump, option.mapper, option.mapperIfUndefined);
@@ -2791,7 +3117,7 @@ export class SqlService {
                 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;
@@ -2824,8 +3150,8 @@ export class SqlService {
             });
         }
     }
-    stream(option) {
-        return new StreamQuery(option?.tableName ?? this[_tableName], this, this[_fields], this[_columns]);
+    stream() {
+        return new StreamQuery(this, this[_fields], this[_columns]);
     }
     page(option) {
         const result = {
@@ -2976,10 +3302,10 @@ export class SqlService {
         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) {
+        var _f;
+        const tableES = option.tableName;
+        (_f = option).force ?? (_f.force = false);
+        if (option.dbType === DBType.Sqlite) {
             if (option?.force) {
                 option.conn.execute(SyncMode.Sync, `DROP TABLE IF EXISTS ${tableES};`);
             }
@@ -2993,9 +3319,9 @@ export class SqlService {
                     // 更新版本
                     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))
+                        .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, `
@@ -3006,7 +3332,7 @@ export class SqlService {
                     `);
                     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};`);
@@ -3030,13 +3356,13 @@ export class SqlService {
                 `);
                 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 {
                     if (option?.force) {
@@ -3052,7 +3378,7 @@ export class SqlService {
                             // 更新版本
                             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))
+                                .map(c => c.name)
                                 .join(',');
                             const rtable = `${option.tableName}_${tableVersion.replace(/\./, '_')}`;
                             await option.conn.execute(SyncMode.Async, `DROP TABLE IF EXISTS ${rtable};`);
@@ -3065,7 +3391,7 @@ export class SqlService {
                         `);
                             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};`);
@@ -3088,7 +3414,7 @@ export class SqlService {
                     `);
                         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]);
@@ -3102,8 +3428,7 @@ export class SqlService {
         }
     }
     close(option) {
-        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);
         }
@@ -3123,7 +3448,7 @@ export class SqlService {
     4. 自定义字段名称：字符串数组
     ** `index` 表的索引，设置方式同ID
      */
-    _createTable({ tableName, temp = true, columns, data, id = 'auto', index = 'auto' } = {}) {
+    _createTable({ tableName, temp = true, columns, data, id = 'auto', index = 'auto', dbType } = {}) {
         const sqls = [];
         columns = columns || this[_columns];
         let ids;
@@ -3152,14 +3477,14 @@ export class SqlService {
         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 = [];
@@ -3172,7 +3497,7 @@ export class SqlService {
                         }).join(',')}`;
                         first = false;
                         return r;
-                    }).join(' UNION ALL ')}`, { dialect: this[_formatDialect] });
+                    }).join(' UNION ALL ')}`, { dialect: mysql });
                     sqls.push({ sql, params });
                 }
                 break;
@@ -3182,11 +3507,11 @@ export class SqlService {
                 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 });
                     }
                 }
@@ -3201,7 +3526,7 @@ export class SqlService {
                         }).join(',')}`;
                         first = false;
                         return r;
-                    }).join(' UNION ALL ')}`, { dialect: this[_formatDialect] });
+                    }).join(' UNION ALL ')}`, { dialect: sqlite });
                     sqls.push({ sql, params });
                 }
                 break;
@@ -3311,7 +3636,7 @@ const IF_EXEC = function (def) {
     };
 };
 class StreamQuery {
-    constructor(table, service, __fields, __columns) {
+    constructor(service, __fields, __columns) {
         this._prefix = 0;
         this._index = 0;
         this._wheres = [];
@@ -3329,7 +3654,6 @@ class StreamQuery {
         this._startRow = 0;
         this._pageSize = 0;
         this._prefix = parseInt(`${Math.random() * 1000}`);
-        this._table = table;
         this._service = service;
         this[_fields] = __fields;
         this[_columns] = __columns;
@@ -3454,7 +3778,7 @@ class StreamQuery {
             this._andQuerys.push(fn);
         }
         else {
-            const stream = new StreamQuery(this._table, this._service, this[_fields], this[_columns]);
+            const stream = new StreamQuery(this._service, this[_fields], this[_columns]);
             const ret = fn(stream);
             if (ret !== false) {
                 this._andQuerys.push(stream);
@@ -3467,7 +3791,7 @@ class StreamQuery {
             this._andQuerys.push(fn);
         }
         else {
-            const stream = new StreamQuery(this._table, this._service, this[_fields], this[_columns]);
+            const stream = new StreamQuery(this._service, this[_fields], this[_columns]);
             const ret = fn(stream);
             if (ret !== false) {
                 this._orQuerys.push(stream);
@@ -3483,7 +3807,6 @@ class StreamQuery {
     desc2(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} ASC`)); return this; }
     limit(startRow, pageSize) { this._startRow = startRow; this._pageSize = pageSize; return this; }
     page(pageNumber, pageSize) { this._startRow = ((pageNumber || 1) - 1) * pageSize; this._pageSize = pageSize; return this; }
-    table(_table) { this._table = _table; return this; }
     distinct(on = true) { this._distinct = on; return this; }
     countDistinct(key, countName) { this._columns.push(`COUNT(DISTINCT ${this[_fields][String(key)]?.C2()}) ${countName || `${this[_fields][String(key)]?.C2()}`}`); return this; }
     count(countName) { this._columns.push(`COUNT(1) ${countName ?? 'ct'}`); return this; }
@@ -3527,7 +3850,7 @@ class StreamQuery {
         let sql = `
             SELECT
             ${this._distinct ? 'DISTINCT' : ''} ${this._columns && this._columns.length > 0 ? this._columns.join(',') : this[_columns].map(key => this[_fields][String(key)]?.C3()).join(',')}
-            FROM ${this._table}
+            FROM ${option.tableName ?? this._service[_tableName]}
             ${where ? ' WHERE ' : ''}
             ${where}
             ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
@@ -3576,7 +3899,7 @@ class StreamQuery {
         let sql = `
             SELECT
             ${this._distinct ? 'DISTINCT' : ''} ${this._columns && this._columns.length > 0 ? this._columns.join(',') : this[_columns].map(key => this[_fields][String(key)]?.C3()).join(',')}
-            FROM ${this._table}
+            FROM ${option.tableName ?? this._service[_tableName]}
             ${where ? ' WHERE ' : ''}
             ${where}
             ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
@@ -3590,7 +3913,7 @@ class StreamQuery {
         }
         const sqlCount = `
             SELECT COUNT(1)
-            FROM ${this._table}
+            FROM ${option.tableName ?? this._service[_tableName]}
             ${where ? ' WHERE ' : ''}
             ${where}
             ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
@@ -3661,7 +3984,7 @@ class StreamQuery {
             }
         }
         if (sets.length > 0) {
-            const sql = `UPDATE ${this._table} SET ${sets.join(',')}
+            const sql = `UPDATE ${option.tableName ?? this._service[_tableName]} SET ${sets.join(',')}
             ${where ? ' WHERE ' : ''}
             ${where}
             `;
@@ -3680,7 +4003,7 @@ class StreamQuery {
         option ?? (option = {});
         option.sync ?? (option.sync = SyncMode.Async);
         const { where, params } = this._where();
-        const sql = `DELETE FROM ${this._table}
+        const sql = `DELETE FROM ${option.tableName ?? this._service[_tableName]}
             ${where ? ' WHERE ' : ''}
             ${where}
         `;
@@ -4277,12 +4600,6 @@ __decorate([
     __metadata("design:paramtypes", [Number, Number]),
     __metadata("design:returntype", void 0)
 ], StreamQuery.prototype, "page", null);
-__decorate([
-    IF_PROCEED(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", void 0)
-], StreamQuery.prototype, "table", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),