@dascompany/database 4.0.5 → 4.0.7

package/dist/Connection.d.ts

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

package/dist/Connection.js

@@ -1,36 +1,14 @@
 import Query from './query/Query';
 export default class Connection {
     pgPool;
-    client = null;
     constructor(pgPool) {
         this.pgPool = pgPool;
     }
-    createQuery(queryString) {
-        return new Query(this.client ?? this.pgPool, queryString);
+    createQuery(queryString, client) {
+        return new Query(client ?? this.pgPool, queryString);
     }
-    async beginTransaction() {
-        if (this.client) {
-            throw new Error('Transaction has already been started.');
-        }
-        this.client = await this.pgPool.connect();
-        await this.client.query('BEGIN');
-        console.log('Transaction started');
-    }
-    async commitTransaction() {
-        if (!this.client) {
-            throw new Error('No transaction started to commit.');
-        }
-        await this.client.query('COMMIT');
-        this.client.release();
-        this.client = null;
-    }
-    async rollBackTransaction() {
-        if (!this.client) {
-            throw new Error('No transaction started to roll back.');
-        }
-        await this.client.query('ROLLBACK');
-        this.client.release();
-        this.client = null;
+    async getClient() {
+        return this.pgPool.connect();
     }
     async end() {
         await this.pgPool.end();

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dascompany/database",
-  "version": "4.0.5",
+  "version": "4.0.7",
   "main": "dist/index.js",
   "scripts": {
     "test": "vitest",