baja-lite 1.0.26 → 1.0.29

package/cjs/boot.js

@@ -41,6 +41,7 @@ const Boot = async function (options) {
     globalThis[sql_1._dao] = {
         [sql_1.DBType.Mongo]: {},
         [sql_1.DBType.Mysql]: {},
+        [sql_1.DBType.Postgresql]: {},
         [sql_1.DBType.Sqlite]: {},
         [sql_1.DBType.SqliteRemote]: {},
         [sql_1.DBType.Redis]: {}
@@ -151,5 +152,22 @@ const Boot = async function (options) {
         });
         globalThis[sql_1._EventBus] = event;
     }
+    if (options.Postgresql) {
+        const Pool = await Promise.resolve().then(() => __importStar(require('pg-pool')));
+        if (options.Postgresql['host']) {
+            globalThis[sql_1._dao][sql_1.DBType.Postgresql][sql_1._primaryDB] = new sql_1.Postgresql(new Pool.default(options.Postgresql));
+        }
+        else {
+            let flag = false;
+            for (const [key, option] of Object.entries(options.Postgresql)) {
+                const db = new sql_1.Postgresql(new Pool.default(option));
+                if (flag === false) {
+                    globalThis[sql_1._dao][sql_1.DBType.Postgresql][sql_1._primaryDB] = db;
+                    flag = true;
+                }
+                globalThis[sql_1._dao][sql_1.DBType.Postgresql][key] = db;
+            }
+        }
+    }
 };
 exports.Boot = Boot;

package/cjs/sql.d.ts

@@ -23,7 +23,6 @@ export declare const _sqlCache: unique symbol;
 export declare const _dao: unique symbol;
 export declare const _primaryDB = "______primaryDB_______";
 declare const _dbType: unique symbol;
-declare const _formatDialect: unique symbol;
 declare const _sqlite_version: unique symbol;
 declare const _daoConnection: unique symbol;
 declare const _inTransaction: unique symbol;
@@ -36,14 +35,15 @@ export declare const _GlobalSqlOption: unique symbol;
 export declare const _EventBus: unique symbol;
 export declare const _path: unique symbol;
 export declare const _fs: unique symbol;
-export declare const logger: import("pino").Logger<never>;
+export declare const logger: import("pino").Logger<never, boolean>;
 export declare enum DBType {
     Mysql = 0,
-    Sqlite = 1,
-    Mongo = 2,
-    SqliteRemote = 3,
-    Redis = 4,
-    RedisLock = 5
+    Postgresql = 1,
+    Sqlite = 2,
+    Mongo = 3,
+    SqliteRemote = 4,
+    Redis = 5,
+    RedisLock = 6
 }
 export declare enum MapperIfUndefined {
     Null = 0,
@@ -159,17 +159,7 @@ export declare enum SqlType {
     mediumtext = 20,
     longblob = 21,
     longtext = 22,
-    set = 23,
-    enum = 24,
-    json = 25,
-    geometry = 26,
-    point = 27,
-    linestring = 28,
-    polygon = 29,
-    multipoint = 30,
-    multilinestring = 31,
-    multipolygon = 32,
-    geometrycollection = 33
+    json = 23
 }
 export declare enum ColumnMode {
     NONE = 0,
@@ -180,6 +170,7 @@ interface MethodOption {
     tableName?: string;
     /** 数据库、连接名称，对于MYSQL、mongo，适用于多数据源，对于sqlite，适用于不同的数据库文件  */
     dbName?: string;
+    dbType?: DBType;
     /** 调用时，永远不需要传
      * @deprecated
      * */
@@ -225,7 +216,6 @@ interface ServiceOption {
 }
 /**
  # 全局行为配置文件
-   MYSQL编码： 'utf8mb4', utf8mb4_general_ci'
  ### `sqlDir?: string;` 数据库查询语句存放目录.存放格式为 export.default 的js、ts， 存放内容满足格式：
 
     ```
@@ -250,7 +240,7 @@ export interface GlobalSqlOptionForWeb {
         ```
         db: 'd:/1.db'
         ```
-        ## 多数据源：传入多个Mysql2的连接配置
+        ## 多数据源：传入多个连接配置
         ```
         db: {
                 db1: 'd:/1.db',
@@ -300,6 +290,8 @@ export interface GlobalSqlOptionForWeb {
      * ```
      */
     columnMode?: ColumnMode;
+    /** 对于WEB模式，默认为SqliteRemote */
+    dbType?: DBType;
 }
 /**
  # 全局行为配置文件
@@ -340,12 +332,70 @@ export interface GlobalSqlOption extends GlobalSqlOptionForWeb {
        ```
       */
     Mysql?: Record<string, Record<string, any>> | Record<string, any>;
+    /**
+         初始化postgresql链接 支持多数据源
+         ## 单一数据源: 直接传入postgresql的连接配置
+         [Postgresql初始化文档](https://github.com/brianc/node-postgres/tree/master/packages/pg-pool)
+         ```
+         Postgresql: {
+            database: 'postgres',
+            user: 'brianc',
+            password: 'secret!',
+            port: 5432,
+            ssl: true,
+            max: 20, // set pool max size to 20
+            idleTimeoutMillis: 1000, // close idle clients after 1 second
+            connectionTimeoutMillis: 1000, // return an error after 1 second if connection could not be established
+            maxUses: 7500, // close (and replace) a connection after it has been used 7500 times (see below for discussion)
+            host?: string | undefined;
+            connectionString?: string | undefined;
+            keepAlive?: boolean | undefined;
+            stream?: () => stream.Duplex | stream.Duplex | undefined;
+            statement_timeout?: false | number | undefined;
+            query_timeout?: number | undefined;
+            keepAliveInitialDelayMillis?: number | undefined;
+            idle_in_transaction_session_timeout?: number | undefined;
+            application_name?: string | undefined;
+            types?: CustomTypesConfig | undefined;
+            options?: string | undefined;
+         }
+         ```
+         ## 多数据源：传入多个Postgresql的连接配置
+         ```
+         Postgresql: {
+            db1: {
+              database: 'postgres',
+              user: 'brianc',
+              password: 'secret!',
+              port: 5432,
+              ssl: true,
+              max: 20, // set pool max size to 20
+              idleTimeoutMillis: 1000, // close idle clients after 1 second
+              connectionTimeoutMillis: 1000, // return an error after 1 second if connection could not be established
+              maxUses: 7500, // close (and replace) a connection after it has been used 7500 times (see below for discussion)
+            },
+            db2: {
+              database: 'postgres',
+              user: 'brianc',
+              password: 'secret!',
+              port: 5432,
+              ssl: true,
+              max: 20, // set pool max size to 20
+              idleTimeoutMillis: 1000, // close idle clients after 1 second
+              connectionTimeoutMillis: 1000, // return an error after 1 second if connection could not be established
+              maxUses: 7500, // close (and replace) a connection after it has been used 7500 times (see below for discussion)
+            },
+            ...
+         }
+         ```
+        */
+    Postgresql?: Record<string, Record<string, any>> | Record<string, any>;
     /**
      ## 单一数据源
      ```
      Sqlite: 'd:/1.db'
      ```
-     ## 多数据源：传入多个Mysql2的连接配置
+     ## 多数据源：传入多个连接配置
      ```
        Sqlite: {
             db1: 'd:/1.db',
@@ -472,6 +522,7 @@ interface AField extends FieldOption {
     C?: () => string;
     /** 查询用：b_id bId */
     C3: () => string;
+    [DBType.Postgresql]: () => string;
     [DBType.Mysql]: () => string;
     [DBType.Sqlite]: () => string;
     [DBType.SqliteRemote]: () => string;
@@ -539,6 +590,24 @@ interface Dao {
 export declare class Mysql implements Dao {
     [_daoDB]: any;
     constructor(pool: any);
+    keepAlive(): Promise<void>;
+    createConnection(sync: SyncMode.Sync): Connection | null;
+    createConnection(sync: SyncMode.Async): Promise<Connection | null>;
+    transaction<T = any>(sync: SyncMode.Sync, fn: (conn: Connection) => T, conn?: Connection | null): T | null;
+    transaction<T = any>(sync: SyncMode.Async, fn: (conn: Connection) => Promise<T>, conn?: Connection | null): Promise<T | null>;
+    close(sync: SyncMode.Sync): void;
+    close(sync: SyncMode.Async): Promise<void>;
+    backup(sync: SyncMode.Sync, name: string): void;
+    backup(sync: SyncMode.Async, name: string): Promise<void>;
+    remove(sync: SyncMode.Sync): void;
+    remove(sync: SyncMode.Async): Promise<void>;
+    restore(sync: SyncMode.Sync, name: string): void;
+    restore(sync: SyncMode.Async, name: string): Promise<void>;
+}
+export declare class Postgresql implements Dao {
+    [_daoDB]: any;
+    constructor(pool: any);
+    keepAlive(): Promise<void>;
     createConnection(sync: SyncMode.Sync): Connection | null;
     createConnection(sync: SyncMode.Async): Promise<Connection | null>;
     transaction<T = any>(sync: SyncMode.Sync, fn: (conn: Connection) => T, conn?: Connection | null): T | null;
@@ -684,8 +753,7 @@ export declare const DB: (config: ServiceOption) => <C extends {
         [_ClassName]: string | undefined;
         [_vueName]: string | undefined;
         [_daoDBName]: string | undefined;
-        [_dbType]: DBType;
-        [_formatDialect]: any;
+        [_dbType]: DBType | undefined;
         [_sqlite_version]: string | undefined;
         [_SqlOption]: {
             maxDeal: number;
@@ -752,7 +820,7 @@ export declare function DeclareService(clz: any, config: ServiceOption): any;
  
  */
 export declare class SqlService<T extends object> {
-    private [_tableName]?;
+    [_tableName]?: string;
     private [_className]?;
     private [_ClassName]?;
     private [_vueName]?;
@@ -766,7 +834,6 @@ export declare class SqlService<T extends object> {
     private [_deleteState]?;
     private [_SqlOption]?;
     private [_dbType]?;
-    private [_formatDialect]?;
     private [_sqlite_version]?;
     private [_index]?;
     private [_def]?;
@@ -1266,7 +1333,7 @@ export declare class SqlService<T extends object> {
         sync: SyncMode.Sync;
         fn: (conn: Connection) => L;
     }): L | null;
-    stream<L extends object = T>(option?: MethodOption): StreamQuery<L>;
+    stream<L extends object = T>(): StreamQuery<L>;
     page<L = T>(option: MethodOption & {
         sync?: SyncMode.Async;
         sqlId: string;
@@ -1362,7 +1429,6 @@ declare class StreamQuery<T extends object> {
     private _param;
     if_proceed: boolean;
     if_exec: boolean;
-    private _table;
     private _distinct;
     private _columns;
     private _updates?;
@@ -1374,7 +1440,7 @@ declare class StreamQuery<T extends object> {
     private _service;
     private [_fields];
     private [_columns];
-    constructor(table: string, service: SqlService<T>, __fields: Record<string, AField>, __columns: string[]);
+    constructor(service: SqlService<T>, __fields: Record<string, AField>, __columns: string[]);
     /** 将当前stream重置 */
     reset(): this;
     /** 为下次链条执行提供条件判断：非异步方法跳过，异步方法不执行并返回默认值 */
@@ -1606,7 +1672,6 @@ declare class StreamQuery<T extends object> {
     desc2(...keys: string[]): this;
     limit(startRow: number, pageSize: number): this;
     page(pageNumber: number, pageSize: number): this;
-    table(_table: string): this;
     distinct(on?: boolean): this;
     countDistinct(key: keyof T, countName?: string): this;
     count(countName?: string): this;