baja-lite 1.2.1 → 1.3.1

package/sql.js

@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var _b, _c, _d, _e;
 var _f, _g, _h, _j;
 import { decode, DecodeError, encode, ExtensionCodec } from "@msgpack/msgpack";
+import { _columns, _columnsNoId, _def, _deleteState, _fields, _Hump, _ids, _index, _logicIds, _stateFileName, DBType, Field } from 'baja-lite-field';
 import HTML from 'html-parse-stringify';
 import * as ite from 'iterare';
 import LGet from 'lodash.get';
@@ -57,16 +58,7 @@ const _tableName = Symbol('tableName');
 const _className = Symbol('className');
 const _ClassName = Symbol('ClassName');
 const _vueName = Symbol('vueName');
-const _ids = Symbol('ids');
-const _logicIds = Symbol('logicIds');
-const _columns = Symbol('columns');
-const _columnsNoId = Symbol('columnsNoId');
-const _fields = Symbol('fields');
-const _stateFileName = Symbol('stateFileName');
-const _deleteState = Symbol('deleteState');
 const _transformer = Symbol('transformer');
-const _index = Symbol('index');
-const _def = Symbol('def');
 const _comment = Symbol('comment');
 export const _sqlCache = Symbol('sqlMap');
 export const _dao = Symbol('dao');
@@ -81,7 +73,6 @@ const _SqlOption = Symbol('SqlOption');
 const _resultMap = Symbol('resultMap');
 const _resultMap_SQLID = Symbol('resultMap_SQLID');
 export const _enums = Symbol('_enums');
-export const _Hump = Symbol('Hump');
 export const _GlobalSqlOption = Symbol('GlobalSqlOption');
 export const _EventBus = Symbol('EventBus');
 export const _path = Symbol('path');
@@ -95,17 +86,6 @@ export const logger = process.env['NODE_ENV'] !== 'production' ? pino({
 globalThis[_resultMap_SQLID] = {};
 // #endregion
 // #region 可选配置
-export var DBType;
-(function (DBType) {
-    DBType[DBType["Mysql"] = 0] = "Mysql";
-    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;
 (function (MapperIfUndefined) {
     MapperIfUndefined[MapperIfUndefined["Null"] = 0] = "Null";
@@ -214,33 +194,6 @@ export var SelectResult;
     /** 多行多列并封装ArrayList */
     SelectResult[SelectResult["RS_CS_List"] = 7] = "RS_CS_List";
 })(SelectResult || (SelectResult = {}));
-export var SqlType;
-(function (SqlType) {
-    SqlType[SqlType["tinyint"] = 0] = "tinyint";
-    SqlType[SqlType["smallint"] = 1] = "smallint";
-    SqlType[SqlType["mediumint"] = 2] = "mediumint";
-    SqlType[SqlType["int"] = 3] = "int";
-    SqlType[SqlType["bigint"] = 4] = "bigint";
-    SqlType[SqlType["float"] = 5] = "float";
-    SqlType[SqlType["double"] = 6] = "double";
-    SqlType[SqlType["decimal"] = 7] = "decimal";
-    SqlType[SqlType["date"] = 8] = "date";
-    SqlType[SqlType["time"] = 9] = "time";
-    SqlType[SqlType["year"] = 10] = "year";
-    SqlType[SqlType["datetime"] = 11] = "datetime";
-    SqlType[SqlType["timestamp"] = 12] = "timestamp";
-    SqlType[SqlType["char"] = 13] = "char";
-    SqlType[SqlType["varchar"] = 14] = "varchar";
-    SqlType[SqlType["tinyblob"] = 15] = "tinyblob";
-    SqlType[SqlType["tinytext"] = 16] = "tinytext";
-    SqlType[SqlType["blob"] = 17] = "blob";
-    SqlType[SqlType["text"] = 18] = "text";
-    SqlType[SqlType["mediumblob"] = 19] = "mediumblob";
-    SqlType[SqlType["mediumtext"] = 20] = "mediumtext";
-    SqlType[SqlType["longblob"] = 21] = "longblob";
-    SqlType[SqlType["longtext"] = 22] = "longtext";
-    SqlType[SqlType["json"] = 23] = "json";
-})(SqlType || (SqlType = {}));
 export var ColumnMode;
 (function (ColumnMode) {
     ColumnMode[ColumnMode["NONE"] = 0] = "NONE";
@@ -271,7 +224,7 @@ class MysqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -304,7 +257,7 @@ class MysqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -340,7 +293,7 @@ class MysqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -374,7 +327,7 @@ class MysqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -408,7 +361,7 @@ class MysqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -550,7 +503,7 @@ class PostgresqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -587,7 +540,7 @@ class PostgresqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -627,7 +580,7 @@ class PostgresqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -665,7 +618,7 @@ class PostgresqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -703,7 +656,7 @@ class PostgresqlConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -850,7 +803,7 @@ class SqliteConnection {
             }
             ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(sql, params);
+                logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
             }
             const result = this[_daoConnection].prepare(sql).run(params ?? {});
             if (globalThis[_GlobalSqlOption].log === 'trace') {
@@ -881,7 +834,7 @@ class SqliteConnection {
             }
             ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(sql, params);
+                logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
             }
             return this[_daoConnection].prepare(sql).pluck().get(params ?? {});
         }
@@ -906,7 +859,7 @@ class SqliteConnection {
             }
             ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(sql, params);
+                logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
             }
             return this[_daoConnection].prepare(sql).get(params ?? {});
         }
@@ -932,7 +885,7 @@ class SqliteConnection {
             }
             ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(sql, params);
+                logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
             }
             return this[_daoConnection].prepare(sql).raw().all(params ?? {});
         }
@@ -958,7 +911,7 @@ class SqliteConnection {
             }
             ;
             if (globalThis[_GlobalSqlOption].log === 'trace') {
-                logger.trace(sql, params);
+                logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
             }
             return this[_daoConnection].prepare(sql).all(params ?? {});
         }
@@ -1055,7 +1008,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -1085,7 +1038,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -1115,7 +1068,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -1145,7 +1098,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -1175,7 +1128,7 @@ export class SqliteRemoteConnection {
         }
         ;
         if (globalThis[_GlobalSqlOption].log === 'trace') {
-            logger.trace(sql, params);
+            logger.trace(`${sql}\n,${JSON.stringify(params ?? '')}`);
         }
         return new Promise(async (resolve, reject) => {
             try {
@@ -1974,233 +1927,6 @@ 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 = () => 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.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.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.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.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()} 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.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.Postgresql] = () => `${field.C2()} jsonb ${config.notNull === true ? 'NOT NULL' : ''} ${POSTGRESCHARSET} ${hasDef ? `DEFAULT '${field.def}'` : ''}`;
-                field[DBType.SqliteRemote] = field[DBType.Sqlite] = () => `${field.C2()} text`;
-                break;
-            }
-        }
-        ;
-        let __fields = Reflect.getMetadata(_fields, object);
-        let __columns = Reflect.getMetadata(_columns, object);
-        let __columnsNoId = Reflect.getMetadata(_columnsNoId, object);
-        let __ids = Reflect.getMetadata(_ids, object);
-        let __logicIds = Reflect.getMetadata(_logicIds, object);
-        let __index = Reflect.getMetadata(_index, object);
-        let __def = Reflect.getMetadata(_def, object);
-        if (!__fields) {
-            __fields = {};
-            __columns = [];
-            __columnsNoId = [];
-            __ids = [];
-            __index = [];
-            __def = {};
-        }
-        __fields[propertyName] = field;
-        __columns.push(propertyName);
-        if (field.id === true) {
-            __ids.push(propertyName);
-        }
-        else {
-            __columnsNoId.push(propertyName);
-        }
-        if (field.logicId === true) {
-            __logicIds.push(propertyName);
-        }
-        if (field.index === true) {
-            __index.push(propertyName);
-        }
-        if (hasDef) {
-            __def[propertyName] = field.def;
-        }
-        Reflect.defineMetadata(_fields, __fields, object);
-        Reflect.defineMetadata(_columns, __columns, object);
-        Reflect.defineMetadata(_columnsNoId, __columnsNoId, object);
-        Reflect.defineMetadata(_ids, __ids, object);
-        Reflect.defineMetadata(_logicIds, __logicIds, object);
-        Reflect.defineMetadata(_index, __index, object);
-        Reflect.defineMetadata(_def, __def, object);
-        if (field.hasOwnProperty('logicDelete')) {
-            Reflect.defineMetadata(_deleteState, field.logicDelete, object);
-            Reflect.defineMetadata(_stateFileName, propertyName, object);
-        }
-    };
-};
 const formatDialects = {
     [DBType.Mysql]: mysql,
     [DBType.Sqlite]: sqlite,
@@ -3064,27 +2790,7 @@ export class SqlService {
         }
         const _params = Object.assign({}, option.context, option.params);
         option.sql ?? (option.sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, isCount: option.isCount, ..._params }));
-        const params = [];
-        const sql = formatDialect(option.sql?.replace(/\:([A-Za-z0-9._]+)/g, (txt, key) => {
-            let V = LGet(_params, key);
-            if (V !== undefined) {
-                params.push(V);
-                return '?';
-            }
-            const _key = C2P(key);
-            V = LGet(_params, _key);
-            if (V !== undefined) {
-                params.push(V);
-                return '?';
-            }
-            const __key = P2C(key);
-            V = LGet(_params, __key);
-            if (V !== undefined) {
-                params.push(V);
-                return '?';
-            }
-            return txt;
-        }), { dialect: formatDialects[option.dbType] });
+        const { sql, params } = this._generSql(option.dbType, option.sql, _params);
         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);
@@ -3105,27 +2811,7 @@ export class SqlService {
         Throw.if(!option.sqlId && !option.sql, 'not found sql!');
         const _params = Object.assign({}, option.context, option.params);
         option.sql ?? (option.sql = globalThis[_sqlCache].load(this._matchSqlid(option.sqlId), { ctx: option.context, ..._params }));
-        const params = [];
-        const sql = formatDialect(option.sql?.replace(/\:(\w+)/g, (txt, key) => {
-            let V = LGet(_params, key);
-            if (V !== undefined) {
-                params.push(V);
-                return '?';
-            }
-            const _key = C2P(key);
-            V = LGet(_params, _key);
-            if (V !== undefined) {
-                params.push(V);
-                return '?';
-            }
-            const __key = P2C(key);
-            V = LGet(_params, __key);
-            if (V !== undefined) {
-                params.push(V);
-                return '?';
-            }
-            return txt;
-        }), { dialect: formatDialects[option.dbType] });
+        const { sql, params } = this._generSql(option.dbType, option.sql, _params);
         if (option.sync === SyncMode.Sync) {
             const result = option.conn.execute(SyncMode.Sync, sql, params);
             return result.affectedRows;
@@ -3549,6 +3235,37 @@ export class SqlService {
         else
             return [`${this[_tableName]}.${sqlid}`, `${this[_className]}.${sqlid}`, `${this[_ClassName]}.${sqlid}`, `${this[_vueName]}.${sqlid}`];
     }
+    _setParam(v, ps) {
+        if (v instanceof Array) {
+            ps.push(...v);
+            return v.map(i => '?').join(',');
+        }
+        else {
+            ps.push(v);
+            return '?';
+        }
+    }
+    _generSql(dbType, _sql, _params) {
+        const params = [];
+        const sql = formatDialect(_sql?.replace(/\:(\w+)/g, (txt, key) => {
+            let V = LGet(_params, key);
+            if (V !== undefined) {
+                return this._setParam(V, params);
+            }
+            const _key = C2P(key);
+            V = LGet(_params, _key);
+            if (V !== undefined) {
+                return this._setParam(V, params);
+            }
+            const __key = P2C(key);
+            V = LGet(_params, __key);
+            if (V !== undefined) {
+                return this._setParam(V, params);
+            }
+            return txt;
+        }), { dialect: formatDialects[dbType] });
+        return { params, sql };
+    }
 }
 __decorate([
     P(),
@@ -3686,6 +3403,7 @@ class StreamQuery {
         this.if_proceed = condition;
         return this;
     }
+    eqs(keys, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this.__(keys, value, '=', { paramName, skipEmptyString, breakExcuteIfSkip }); }
     eq(key, value, { paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) { return this._(key, value, '=', { paramName, skipEmptyString, breakExcuteIfSkip }); }
     eqT(t, { name: paramName = '', breakExcuteIfSkip = false } = {}) {
         let exe = false;
@@ -4061,7 +3779,6 @@ class StreamQuery {
             this._param[this._paramKeys[paramName]] = value;
         }
         else {
-            paramName;
             const pkey = `p${this._prefix}${this._index++}`;
             this._wheres.push(`AND ${this[_fields][String(key)]?.C2()} ${not} ${op} :${pkey} `);
             this._param[pkey] = value;
@@ -4071,6 +3788,28 @@ class StreamQuery {
         }
         return this;
     }
+    __(keys, value, op, { not = '', paramName = '', skipEmptyString = true, breakExcuteIfSkip = false } = {}) {
+        if (value === null
+            || value === undefined
+            || (emptyString(`${value ?? ''}`) && skipEmptyString === true)) {
+            if (breakExcuteIfSkip === true) {
+                this.if_exec = false;
+            }
+            return this;
+        }
+        if (paramName !== undefined && this._paramKeys.hasOwnProperty(paramName)) {
+            this._param[this._paramKeys[paramName]] = value;
+        }
+        else {
+            const pkey = `p${this._prefix}${this._index++}`;
+            this._wheres.push(`AND (${keys.map(key => `${this[_fields][String(key)]?.C2()} ${not} ${op} :${pkey} `).join(' OR ')})`);
+            this._param[pkey] = value;
+            if (paramName) {
+                this._paramKeys[paramName] = pkey;
+            }
+        }
+        return this;
+    }
     _null(key, not = '') {
         this._wheres.push(`AND ${this[_fields][String(key)]?.C2()} IS ${not} NULL`);
         return this;
@@ -4242,6 +3981,12 @@ __decorate([
     __metadata("design:paramtypes", [Boolean]),
     __metadata("design:returntype", void 0)
 ], StreamQuery.prototype, "if", null);
+__decorate([
+    IF_PROCEED(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Array, Object, Object]),
+    __metadata("design:returntype", void 0)
+], StreamQuery.prototype, "eqs", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),