@dascompany/database 4.0.0 → 4.0.2

package/dist/Connection.d.ts

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

package/dist/Connection.js

@@ -1,37 +1,22 @@
 import Query from './query/Query';
 export default class Connection {
-    client;
-    inTransaction = false;
-    constructor(client) {
-        this.client = client;
+    pgClient;
+    constructor(pgClient) {
+        this.pgClient = pgClient;
+    }
+    createQuery(queryString) {
+        return new Query(this.pgClient, queryString);
     }
     async beginTransaction() {
-        await this.client.query('BEGIN');
-        this.inTransaction = true;
+        await this.pgClient.query('BEGIN');
     }
     async commitTransaction() {
-        if (!this.inTransaction)
-            throw new Error('Transaction has not been started.');
-        await this.client.query('COMMIT');
-        this.inTransaction = false;
-        this.client.release();
+        await this.pgClient.query('COMMIT');
     }
     async rollBackTransaction() {
-        if (!this.inTransaction)
-            throw new Error('Transaction has not been started.');
-        await this.client.query('ROLLBACK');
-        this.inTransaction = false;
-        this.client.release();
-    }
-    createQuery(queryString) {
-        return new Query(this.client, queryString);
+        await this.pgClient.query('ROLLBACK');
     }
     async end() {
-        if (!this.inTransaction) {
-            this.client.release();
-        }
-        else {
-            throw new Error('Cannot release client while transaction is active.');
-        }
+        this.pgClient.end();
     }
 }

package/dist/ConnectionFactory.d.ts

@@ -1,11 +1,14 @@
 import DatabaseConfig from "./DatabaseConfig";
 import Connection from "./Connection";
 export default class ConnectionFactory {
-    private static pool;
+    private static connections;
     private static configName;
     private static configField;
     private static configPath;
     private static defaultDatabaseName;
     static create(name?: string): Promise<Connection>;
+    static isCreated(name?: string): boolean;
+    static get(name?: string): Connection;
+    private static createConnection;
     protected static getDatabaseConfig(): Promise<DatabaseConfig>;
 }

package/dist/ConnectionFactory.js

@@ -2,18 +2,41 @@ import Database from "./Database";
 import Connection from "./Connection";
 import { readFile } from 'fs/promises';
 export default class ConnectionFactory {
-    static pool = null;
+    static connections = new Map();
     static configName = 'config.json';
     static configField = 'database';
     static configPath = './server/';
     static defaultDatabaseName = 'defaultDatabaseName';
     static async create(name) {
-        if (!this.pool) {
-            const config = await this.getDatabaseConfig();
-            this.pool = Database.connect(config);
+        name = name || this.defaultDatabaseName;
+        let connection = this.connections.get(name);
+        if (!connection) {
+            connection = await this.createConnection();
+            this.connections.set(name, connection);
         }
-        const client = await this.pool.connect();
-        return new Connection(client);
+        else
+            throw new Error(`Connection for name: ${name} is already created! `);
+        return connection;
+    }
+    static isCreated(name) {
+        name = name || this.defaultDatabaseName;
+        let connection = this.connections.get(name);
+        if (!connection)
+            return false;
+        else
+            return true;
+    }
+    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! `);
+        return connection;
+    }
+    static async createConnection() {
+        const databaseConfig = await this.getDatabaseConfig();
+        const pgClient = await Database.connect(databaseConfig);
+        return new Connection(pgClient);
     }
     static async getDatabaseConfig() {
         let config = JSON.parse(await readFile(`${this.configPath}${this.configName}`, "utf8"));

package/dist/Database.d.ts

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

package/dist/Database.js

@@ -1,11 +1,14 @@
-import { Pool } from 'pg';
+import pg from 'pg';
 export default class Database {
-    static pool = null;
-    static connect(connectionConfig) {
-        if (!this.pool) {
-            this.pool = new Pool(connectionConfig);
-            console.log('Database pool created');
+    static async connect(connectionConfig) {
+        try {
+            const pgClient = new pg.Client(connectionConfig);
+            await pgClient.connect();
+            return pgClient;
+        }
+        catch (error) {
+            error.message = `Database connection failed!\n ${error.message}`;
+            throw error;
         }
-        return this.pool;
     }
 }

package/package.json

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