@dascompany/database 4.0.8 → 4.0.10

package/dist/Connection.d.ts

@@ -1,11 +1,9 @@
-import { Client } from 'pg';
+import pg from 'pg';
 import Query from './query/Query';
 export default class Connection {
-    private pgClient;
-    constructor(pgClient: Client);
-    createQuery(queryString: string): Query;
-    beginTransaction(): Promise<void>;
-    commitTransaction(): Promise<void>;
-    rollBackTransaction(): Promise<void>;
+    private pgPool;
+    constructor(pgPool: pg.Pool);
+    createQuery(queryString: string, client: pg.PoolClient): Query;
+    getClient(): Promise<pg.PoolClient>;
     end(): Promise<void>;
 }

package/dist/Connection.js

@@ -1,22 +1,16 @@
 import Query from './query/Query';
 export default class Connection {
-    pgClient;
-    constructor(pgClient) {
-        this.pgClient = pgClient;
+    pgPool;
+    constructor(pgPool) {
+        this.pgPool = pgPool;
     }
-    createQuery(queryString) {
-        return new Query(this.pgClient, queryString);
+    createQuery(queryString, client) {
+        return new Query(client ?? this.pgPool, queryString);
     }
-    async beginTransaction() {
-        await this.pgClient.query('BEGIN');
-    }
-    async commitTransaction() {
-        await this.pgClient.query('COMMIT');
-    }
-    async rollBackTransaction() {
-        await this.pgClient.query('ROLLBACK');
+    async getClient() {
+        return this.pgPool.connect();
     }
     async end() {
-        this.pgClient.end();
+        await this.pgPool.end();
     }
 }

package/dist/ConnectionFactory.js

@@ -9,39 +9,35 @@ export default class ConnectionFactory {
     static defaultDatabaseName = 'defaultDatabaseName';
     static async create(name) {
         name = name || this.defaultDatabaseName;
-        let connection = this.connections.get(name);
-        if (!connection) {
-            connection = await this.createConnection();
-            this.connections.set(name, connection);
+        if (this.connections.has(name)) {
+            throw new Error(`Connection for name: ${name} is already created!`);
         }
-        else
-            throw new Error(`Connection for name: ${name} is already created! `);
+        const connection = await this.createConnection();
+        this.connections.set(name, connection);
         return connection;
     }
     static isCreated(name) {
         name = name || this.defaultDatabaseName;
-        let connection = this.connections.get(name);
-        if (!connection)
-            return false;
-        else
-            return true;
+        return this.connections.has(name);
     }
     static get(name) {
         name = name || this.defaultDatabaseName;
         const connection = this.connections.get(name);
-        if (!connection)
-            throw new Error(`Connection with name: ${name} is not create! `);
+        if (!connection) {
+            throw new Error(`Connection with name: ${name} is not created!`);
+        }
         return connection;
     }
     static async createConnection() {
         const databaseConfig = await this.getDatabaseConfig();
-        const pgClient = await Database.connect(databaseConfig);
-        return new Connection(pgClient);
+        const pgPool = await Database.connect(databaseConfig);
+        return new Connection(pgPool);
     }
     static async getDatabaseConfig() {
         let config = JSON.parse(await readFile(`${this.configPath}${this.configName}`, "utf8"));
-        if (this.configField)
+        if (this.configField) {
             config = config[this.configField];
+        }
         return config;
     }
 }

package/dist/Database.d.ts

@@ -1,4 +1,4 @@
-import { Client, type ConnectionConfig } from 'pg';
+import pg from 'pg';
 export default class Database {
-    static connect(connectionConfig: ConnectionConfig): Promise<Client>;
+    static connect(connectionConfig: pg.PoolConfig): Promise<pg.Pool>;
 }

package/dist/Database.js

@@ -2,12 +2,12 @@ import pg from 'pg';
 export default class Database {
     static async connect(connectionConfig) {
         try {
-            const pgClient = new pg.Client(connectionConfig);
-            await pgClient.connect();
-            return pgClient;
+            const pool = new pg.Pool(connectionConfig);
+            await pool.query('SELECT 1');
+            return pool;
         }
         catch (error) {
-            error.message = `Database connection failed!\n ${error.message}`;
+            error.message = `Database connection failed!\n${error.message}`;
             throw error;
         }
     }

package/dist/Table.d.ts

@@ -1,8 +1,10 @@
 import Connection from './Connection';
 import Query from './query/Query';
 import QueryOptions from './query/QueryOptions';
+import type { PoolClient } from 'pg';
 export default abstract class Table {
     private connection;
-    constructor(connection: Connection);
+    private client;
+    constructor(connection: Connection, client: PoolClient);
     createQuery(queryString: string, options?: QueryOptions): Query;
 }

package/dist/Table.js

@@ -2,15 +2,17 @@ import QueryParams from './query/QueryParams';
 import BindParams from './query/BindParams';
 export default class Table {
     connection;
-    constructor(connection) {
+    client;
+    constructor(connection, client) {
         this.connection = connection;
+        this.client = client;
     }
     createQuery(queryString, options) {
         if (!queryString)
             throw new Error('Nie podano queryString');
         if (options)
             queryString = QueryParams.createParams(queryString, options);
-        const query = this.connection.createQuery(queryString);
+        const query = this.connection.createQuery(queryString, this.client);
         if (options)
             BindParams.bindParams(query, options);
         return query;

package/dist/TransactionClient.d.ts

@@ -0,0 +1,9 @@
+import pg from 'pg';
+export default class TransactionClient {
+    private client;
+    private active;
+    constructor(client: pg.PoolClient);
+    beginTransaction(): Promise<void>;
+    commitTransaction(): Promise<void>;
+    rollBackTransaction(): Promise<void>;
+}

package/dist/TransactionClient.js

@@ -0,0 +1,30 @@
+export default class TransactionClient {
+    client;
+    active = false;
+    constructor(client) {
+        this.client = client;
+    }
+    async beginTransaction() {
+        if (this.active) {
+            throw new Error('Transaction already active');
+        }
+        await this.client.query('BEGIN');
+        this.active = true;
+    }
+    async commitTransaction() {
+        if (!this.active) {
+            throw new Error('No active transaction to commit');
+        }
+        await this.client.query('COMMIT');
+        this.client.release();
+        this.active = false;
+    }
+    async rollBackTransaction() {
+        if (!this.active) {
+            throw new Error('No active transaction to roll back');
+        }
+        await this.client.query('ROLLBACK');
+        this.client.release();
+        this.active = false;
+    }
+}

package/dist/index.d.ts

@@ -13,4 +13,5 @@ import OrderByI from "./types/OrderByI";
 import QueryOptions from './query/QueryOptions';
 import ConnectorE from "./types/ConnectorE";
 import Connection from "./Connection";
-export { ConnectionFactory, StockObject, StockObjectMapper, Table, Query, ParameterType, ParameterFilter, ConnectorE, ParameterI, QueryOptionsI, ResultLimitationI, Parameters, OrderByI, QueryOptions, Connection };
+import TransactionClient from "./TransactionClient";
+export { ConnectionFactory, StockObject, StockObjectMapper, Table, Query, ParameterType, ParameterFilter, ConnectorE, ParameterI, QueryOptionsI, ResultLimitationI, Parameters, OrderByI, QueryOptions, Connection, TransactionClient };

package/dist/index.js

@@ -7,4 +7,5 @@ import Parameters from './utils/Parameters';
 import QueryOptions from './query/QueryOptions';
 import ConnectorE from "./types/ConnectorE";
 import Connection from "./Connection";
-export { ConnectionFactory, StockObject, Table, Query, ParameterType, ConnectorE, Parameters, QueryOptions, Connection };
+import TransactionClient from "./TransactionClient";
+export { ConnectionFactory, StockObject, Table, Query, ParameterType, ConnectorE, Parameters, QueryOptions, Connection, TransactionClient };

package/dist/types/StockObject.d.ts

@@ -2,8 +2,8 @@ import StockObjectMapper from "./StockObjectMapper";
 export default abstract class StockObject {
     private id;
     protected abstract getMapper(): StockObjectMapper;
-    getId(): number | null;
-    setId(clientId: number): void;
+    getId(): string | null;
+    setId(id: string): void;
     save(): Promise<void>;
     delete(): Promise<void>;
 }

package/dist/types/StockObject.js

@@ -3,8 +3,8 @@ export default class StockObject {
     getId() {
         return this.id;
     }
-    setId(clientId) {
-        this.id = clientId;
+    setId(id) {
+        this.id = id;
     }
     async save() {
         await this.getMapper().save();

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@dascompany/database",
-  "version": "4.0.8",
+  "version": "4.0.10",
   "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
     "test": "vitest",
     "build": "tsc --declaration",