@dascompany/database 4.0.4 → 4.0.6

package/dist/Connection.d.ts

@@ -2,10 +2,11 @@ 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<pg.PoolClient>;
-    commitTransaction(client: pg.PoolClient): Promise<void>;
-    rollBackTransaction(client: pg.PoolClient): Promise<void>;
+    beginTransaction(): Promise<void>;
+    commitTransaction(): Promise<void>;
+    rollBackTransaction(): Promise<void>;
     end(): Promise<void>;
 }

package/dist/Connection.js

@@ -1,24 +1,35 @@
 import Query from './query/Query';
 export default class Connection {
     pgPool;
+    client = null;
     constructor(pgPool) {
         this.pgPool = pgPool;
     }
     createQuery(queryString) {
-        return new Query(this.pgPool, queryString);
+        return new Query(this.client ?? this.pgPool, queryString);
     }
     async beginTransaction() {
-        const client = await this.pgPool.connect();
-        await client.query('BEGIN');
-        return client;
+        if (this.client) {
+            throw new Error('Transaction has already been started.');
+        }
+        this.client = await this.pgPool.connect();
+        await this.client.query('BEGIN');
     }
-    async commitTransaction(client) {
-        await client.query('COMMIT');
-        client.release();
+    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(client) {
-        await client.query('ROLLBACK');
-        client.release();
+    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 end() {
         await this.pgPool.end();

package/package.json

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