baja-lite 1.0.27 → 1.0.29

package/cjs/test-postgresql.d.ts

@@ -0,0 +1,2 @@
+import 'reflect-metadata';
+export declare function go2(): Promise<void>;

package/cjs/test-postgresql.js

@@ -0,0 +1,93 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.go2 = go2;
+require("reflect-metadata");
+const boot_1 = require("./boot");
+const sql_1 = require("./sql");
+class AmaFuck2 {
+}
+__decorate([
+    (0, sql_1.Field)({ type: sql_1.SqlType.int, length: 200, id: true, uuid: true }),
+    __metadata("design:type", Number)
+], AmaFuck2.prototype, "userid", void 0);
+__decorate([
+    (0, sql_1.Field)({ type: sql_1.SqlType.varchar, length: 200, def: '333' }),
+    __metadata("design:type", String)
+], AmaFuck2.prototype, "username", void 0);
+__decorate([
+    (0, sql_1.Field)({ type: sql_1.SqlType.varchar, length: 200 }),
+    __metadata("design:type", String)
+], AmaFuck2.prototype, "pwd", void 0);
+let AmaService2 = class AmaService2 extends sql_1.SqlService {
+};
+AmaService2 = __decorate([
+    (0, sql_1.DB)({
+        tableName: 'nfc_user', clz: AmaFuck2, dbType: sql_1.DBType.Postgresql
+    })
+], AmaService2);
+// interface Menu {
+//     resourceid: string;
+//     resourcepid: string;
+//     resourcename: string;
+//     children: Menu[];
+// }
+async function go2() {
+    await (0, boot_1.Boot)({
+        Postgresql: {
+            database: 'nfc',
+            user: 'postgres',
+            password: 'abcd1234',
+            port: 5432,
+            host: '127.0.0.1'
+        },
+        log: 'info',
+        columnMode: sql_1.ColumnMode.HUMP,
+        sqlDir: 'E:/pro/baja-lite/xml',
+        sqlMap: {
+            ['test.test']: `SELECT * FROM nfc_user {{#username}} WHERE username = :username {{/username}}`
+        }
+    });
+    const service = new AmaService2();
+    await service.transaction({
+        fn: async (conn) => {
+            const rt5 = await service.select({
+                sqlId: 'test.test',
+                params: { username: '1111' },
+                selectResult: sql_1.SelectResult.RS_CS,
+                conn
+            });
+            console.log(55, rt5.length);
+            await service.insert({
+                data: {
+                    userid: 22,
+                    username: '222',
+                    pwd: '333'
+                }
+            });
+            return 1;
+        }
+    });
+    // const data = await service.select<Menu>({
+    //     sql: 'SELECT resourceid, resourcepid,resourcename FROM cp_resource ',
+    //     params: {
+    //         site: '1234',
+    //         matchInfo: { reportType: 'yyyy', id: '11' }
+    //     },
+    //     // mapper: [
+    //     //     ['site', ['info', 'bSist'], 989],
+    //     //     ['site', ['info2', 'bSist'], 33],
+    //     //     ['site', ['Bsite'], 0]
+    //     // ]
+    // });
+    // console.log(data);
+}
+go2();

package/es/boot.js

@@ -1,5 +1,5 @@
 import { getEnums } from './enum';
-import { _GlobalSqlOption, _enums, _EventBus, _defOption, logger, _sqlCache, SqlCache, _dao, DBType, _primaryDB, SqliteRemote, _fs, _path, Mysql, Sqlite, _Hump, ColumnMode } from './sql';
+import { _GlobalSqlOption, _enums, _EventBus, _defOption, logger, _sqlCache, SqlCache, _dao, DBType, _primaryDB, SqliteRemote, _fs, _path, Mysql, Sqlite, _Hump, ColumnMode, Postgresql } from './sql';
 export const Boot = async function (options) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
     globalThis[_Hump] = globalThis[_GlobalSqlOption].columnMode === ColumnMode.HUMP;
@@ -15,6 +15,7 @@ export const Boot = async function (options) {
     globalThis[_dao] = {
         [DBType.Mongo]: {},
         [DBType.Mysql]: {},
+        [DBType.Postgresql]: {},
         [DBType.Sqlite]: {},
         [DBType.SqliteRemote]: {},
         [DBType.Redis]: {}
@@ -125,4 +126,21 @@ export const Boot = async function (options) {
         });
         globalThis[_EventBus] = event;
     }
+    if (options.Postgresql) {
+        const Pool = await import('pg-pool');
+        if (options.Postgresql['host']) {
+            globalThis[_dao][DBType.Postgresql][_primaryDB] = new Postgresql(new Pool.default(options.Postgresql));
+        }
+        else {
+            let flag = false;
+            for (const [key, option] of Object.entries(options.Postgresql)) {
+                const db = new Postgresql(new Pool.default(option));
+                if (flag === false) {
+                    globalThis[_dao][DBType.Postgresql][_primaryDB] = db;
+                    flag = true;
+                }
+                globalThis[_dao][DBType.Postgresql][key] = db;
+            }
+        }
+    }
 };

package/es/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;
@@ -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]?;