@dascompany/database 4.0.9 → 4.1.0

package/dist/Connection.d.ts

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

package/dist/Connection.js

@@ -1,22 +1,30 @@
 import Query from './query/Query';
+import TransactionClient from './TransactionClient';
 export default class Connection {
-    pgClient;
-    constructor(pgClient) {
-        this.pgClient = pgClient;
+    pgPool;
+    transactionClient;
+    constructor(pgPool) {
+        this.pgPool = pgPool;
     }
-    createQuery(queryString) {
-        return new Query(this.pgClient, queryString);
+    createQuery(queryString, client) {
+        if (this.transactionClient && this.transactionClient.pending())
+            return new Query(this.transactionClient.getClient(), queryString);
+        else
+            return new Query(client ?? this.pgPool, queryString);
     }
-    async beginTransaction() {
-        await this.pgClient.query('BEGIN');
+    getTransaction() {
+        return this.transactionClient;
     }
-    async commitTransaction() {
-        await this.pgClient.query('COMMIT');
+    async createTransaction() {
+        if (!!this.transactionClient && this.transactionClient.pending())
+            throw new Error("there is no free client ");
+        this.transactionClient = new TransactionClient(await this.getClient());
+        return this.transactionClient;
     }
-    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.d.ts

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

package/dist/ConnectionFactory.js

@@ -2,46 +2,63 @@ import Database from "./Database";
 import Connection from "./Connection";
 import { readFile } from 'fs/promises';
 export default class ConnectionFactory {
+    static numberOfAttemptsAllowed = 3;
     static connections = new Map();
     static configName = 'config.json';
     static configField = 'database';
     static configPath = './server/';
     static defaultDatabaseName = 'defaultDatabaseName';
     static async create(name) {
+        name = name || this.defaultDatabaseName;
+        if (this.connections.has(name)) {
+            throw new Error(`Connection for name: ${name} is already created!`);
+        }
+        const connection = await this.createConnection();
+        this.connections.set(name, connection);
+        return connection;
+    }
+    static async test(name, attempt = 1) {
         name = name || this.defaultDatabaseName;
         let connection = this.connections.get(name);
         if (!connection) {
             connection = await this.createConnection();
             this.connections.set(name, connection);
         }
-        else
-            throw new Error(`Connection for name: ${name} is already created! `);
-        return connection;
+        try {
+            const client = await connection.getClient();
+            connection?.createQuery("SELECT 1", client);
+            return connection;
+        }
+        catch (err) {
+            this.connections.delete(name);
+            if (this.numberOfAttemptsAllowed >= attempt)
+                return this.test('', attempt + 1);
+            else
+                throw new Error("Testing connection failed. Could not re-establish connection. Message: " + err);
+        }
     }
     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/TESTConnection.d.ts

@@ -0,0 +1,12 @@
+import pg from 'pg';
+import Query from './query/Query';
+import TESTTransactionClient from './TESTTransactionClient';
+export default class TESTConnection {
+    private pgPool;
+    private TESTtransactionClient;
+    constructor(pgPool: pg.Pool);
+    createTransaction(): Promise<TESTTransactionClient>;
+    createQuery(queryString: string, client: pg.PoolClient): Query;
+    getClient(): Promise<pg.PoolClient>;
+    end(): Promise<void>;
+}

package/dist/TESTConnection.js

@@ -0,0 +1,25 @@
+import Query from './query/Query';
+import TESTTransactionClient from './TESTTransactionClient';
+export default class TESTConnection {
+    pgPool;
+    TESTtransactionClient;
+    constructor(pgPool) {
+        this.pgPool = pgPool;
+    }
+    async createTransaction() {
+        this.TESTtransactionClient = new TESTTransactionClient(await this.getClient());
+        return this.TESTtransactionClient;
+    }
+    createQuery(queryString, client) {
+        if (this.TESTtransactionClient.pending())
+            return new Query(this.TESTtransactionClient.getClient(), queryString);
+        else
+            return new Query(client ?? this.pgPool, queryString);
+    }
+    async getClient() {
+        return this.pgPool.connect();
+    }
+    async end() {
+        await this.pgPool.end();
+    }
+}

package/dist/TESTConnectionFactory.d.ts

@@ -0,0 +1,16 @@
+import DatabaseConfig from "./DatabaseConfig";
+import TESTConnection from "./TESTConnection";
+export default class TESTConnectionFactory {
+    private static numberOfAttemptsAllowed;
+    private static TESTConnections;
+    private static configName;
+    private static configField;
+    private static configPath;
+    private static defaultDatabaseName;
+    static create(name?: string): Promise<TESTConnection>;
+    static test(name?: string, attempt?: number): Promise<TESTConnection>;
+    static isCreated(name?: string): boolean;
+    static get(name?: string): TESTConnection;
+    private static createTESTConnection;
+    protected static getDatabaseConfig(): Promise<DatabaseConfig>;
+}

package/dist/TESTConnectionFactory.js

@@ -0,0 +1,64 @@
+import Database from "./Database";
+import TESTConnection from "./TESTConnection";
+import { readFile } from 'fs/promises';
+export default class TESTConnectionFactory {
+    static numberOfAttemptsAllowed = 3;
+    static TESTConnections = new Map();
+    static configName = 'config.json';
+    static configField = 'database';
+    static configPath = './server/';
+    static defaultDatabaseName = 'defaultDatabaseName';
+    static async create(name) {
+        name = name || this.defaultDatabaseName;
+        if (this.TESTConnections.has(name)) {
+            throw new Error(`TESTConnection for name: ${name} is already created!`);
+        }
+        const TESTConnection = await this.createTESTConnection();
+        this.TESTConnections.set(name, TESTConnection);
+        return TESTConnection;
+    }
+    static async test(name, attempt = 1) {
+        name = name || this.defaultDatabaseName;
+        const TESTConnection = this.TESTConnections.get(name);
+        if (!TESTConnection) {
+            const TESTConnection = await this.create(name);
+            return TESTConnection;
+        }
+        try {
+            const client = await TESTConnection.getClient();
+            TESTConnection?.createQuery("SELECT 1", client);
+            return TESTConnection;
+        }
+        catch (err) {
+            this.TESTConnections.delete(name);
+            if (this.numberOfAttemptsAllowed >= attempt)
+                return this.test('', attempt + 1);
+            else
+                throw new Error("Testing TESTConnection failed. Could not re-establish TESTConnection.");
+        }
+    }
+    static isCreated(name) {
+        name = name || this.defaultDatabaseName;
+        return this.TESTConnections.has(name);
+    }
+    static get(name) {
+        name = name || this.defaultDatabaseName;
+        const TESTConnection = this.TESTConnections.get(name);
+        if (!TESTConnection) {
+            throw new Error(`TESTConnection with name: ${name} is not created!`);
+        }
+        return TESTConnection;
+    }
+    static async createTESTConnection() {
+        const databaseConfig = await this.getDatabaseConfig();
+        const pgPool = await Database.connect(databaseConfig);
+        return new TESTConnection(pgPool);
+    }
+    static async getDatabaseConfig() {
+        let config = JSON.parse(await readFile(`${this.configPath}${this.configName}`, "utf8"));
+        if (this.configField) {
+            config = config[this.configField];
+        }
+        return config;
+    }
+}

package/dist/TESTTransactionClient.d.ts

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

package/dist/TESTTransactionClient.js

@@ -0,0 +1,36 @@
+export default class TESTTransactionClient {
+    client;
+    active = false;
+    constructor(client) {
+        this.client = client;
+    }
+    pending() {
+        return this.active;
+    }
+    getClient() {
+        return this.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/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

@@ -3,6 +3,8 @@ export default class TransactionClient {
     private client;
     private active;
     constructor(client: pg.PoolClient);
+    pending(): boolean;
+    getClient(): pg.PoolClient;
     beginTransaction(): Promise<void>;
     commitTransaction(): Promise<void>;
     rollBackTransaction(): Promise<void>;

package/dist/TransactionClient.js

@@ -4,6 +4,12 @@ export default class TransactionClient {
     constructor(client) {
         this.client = client;
     }
+    pending() {
+        return this.active;
+    }
+    getClient() {
+        return this.client;
+    }
     async beginTransaction() {
         if (this.active) {
             throw new Error('Transaction already active');

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,7 +1,8 @@
 {
   "name": "@dascompany/database",
-  "version": "4.0.9",
+  "version": "4.1.0",
   "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
     "test": "vitest",
     "build": "tsc --declaration",

package/dist/query/ResultsCorrector.d.ts

@@ -1,4 +0,0 @@
-export default class ResultsCorrector {
-    static correctRows(rows: Array<any>): Array<any>;
-    private static isNumber;
-}

package/dist/query/ResultsCorrector.js

@@ -1,14 +0,0 @@
-export default class ResultsCorrector {
-    static correctRows(rows) {
-        rows.forEach((row) => {
-            Object.keys(row).forEach((key) => {
-                if (this.isNumber(row[key]))
-                    row[key] = Number(row[key]);
-            });
-        });
-        return rows;
-    }
-    static isNumber(n) {
-        return !isNaN(parseFloat(n)) && !isNaN(n - 0);
-    }
-}