@oino-ts/db-postgresql 0.19.0 → 0.20.0

package/dist/cjs/OINODbPostgresql.js

@@ -113,19 +113,56 @@ class OINODbPostgresql extends db_1.OINODb {
         return result;
     }
     async _query(sql) {
-        const query_result = await this._pool.query({ rowMode: "array", text: sql });
-        return Promise.resolve(query_result.rows);
+        let connection = null;
+        try {
+            connection = await this._pool.connect();
+            const query_result = await connection.query({ rowMode: "array", text: sql });
+            let rows;
+            if (Array.isArray(query_result) == true) {
+                rows = query_result.flatMap((q) => q.rows);
+            }
+            else if (query_result.rows) {
+                rows = query_result.rows;
+            }
+            else {
+                rows = db_1.OINODB_EMPTY_ROWS; // return empty row if no rows returned
+            }
+            return new OINOPostgresqlData(rows, []);
+        }
+        catch (e) {
+            return new OINOPostgresqlData(db_1.OINODB_EMPTY_ROWS, []).setError(500, common_1.OINO_ERROR_PREFIX + ": Exception in db query: " + e.message, "OINODbPostgresql._query");
+        }
+        finally {
+            if (connection) {
+                connection.release();
+            }
+        }
     }
     async _exec(sql) {
-        const query_result = await this._pool.query({ rowMode: "array", text: sql });
-        if (Array.isArray(query_result) == true) {
-            return Promise.resolve(query_result.flatMap((q) => q.rows));
+        let connection = null;
+        try {
+            connection = await this._pool.connect();
+            const query_result = await connection.query({ rowMode: "array", text: sql });
+            let rows;
+            if (Array.isArray(query_result) == true) {
+                rows = query_result.flatMap((q) => q.rows);
+            }
+            else if (query_result.rows) {
+                rows = query_result.rows;
+            }
+            else {
+                rows = db_1.OINODB_EMPTY_ROWS; // return empty row if no rows returned
+            }
+            // if (rows.length > 0) { console.log("OINODbPostgresql._exec: rows", rows) }
+            return new OINOPostgresqlData(rows, []);
         }
-        else if (query_result.rows) {
-            return Promise.resolve(query_result.rows);
+        catch (e) {
+            return new OINOPostgresqlData(db_1.OINODB_EMPTY_ROWS, []).setError(500, common_1.OINO_ERROR_PREFIX + ": Exception in db exec: " + e.message, "OINODbPostgresql._exec");
         }
-        else {
-            return Promise.resolve(db_1.OINODB_EMPTY_ROWS); // return empty row if no rows returned
+        finally {
+            if (connection) {
+                connection.release();
+            }
         }
     }
     /**
@@ -227,15 +264,24 @@ class OINODbPostgresql extends db_1.OINODb {
      */
     async connect() {
         let result = new common_1.OINOResult();
+        if (this.isConnected) {
+            return result;
+        }
+        let connection = null;
         try {
             // make sure that any items are correctly URL encoded in the connection string
-            await this._pool.connect();
+            connection = await this._pool.connect();
             this.isConnected = true;
         }
         catch (e) {
             result.setError(500, "Exception connecting to database: " + e.message, "OINODbPostgresql.connect");
             common_1.OINOLog.exception("@oino-ts/db-postgresql", "OINODbPostgresql", "connect", "exception in connect", { message: e.message, stack: e.stack });
         }
+        finally {
+            if (connection) {
+                connection.release();
+            }
+        }
         return result;
     }
     /**
@@ -247,7 +293,7 @@ class OINODbPostgresql extends db_1.OINODb {
         let result = new common_1.OINOResult();
         try {
             const sql = this._getValidateSql(this._params.database);
-            const sql_res = await this.sqlSelect(sql);
+            const sql_res = await this._query(sql);
             if (sql_res.isEmpty()) {
                 result.setError(400, "DB returned no rows for select!", "OINODbPostgresql.validate");
             }
@@ -268,6 +314,19 @@ class OINODbPostgresql extends db_1.OINODb {
         common_1.OINOBenchmark.endMetric("OINODb", "validate");
         return result;
     }
+    /**
+     * Disconnect from database.
+     *
+     */
+    async disconnect() {
+        if (this.isConnected) {
+            this._pool.end().catch((e) => {
+                common_1.OINOLog.exception("@oino-ts/db-postgresql", "OINODbPostgresql", "disconnect", "exception in pool end", { message: e.message, stack: e.stack });
+            });
+        }
+        this.isConnected = false;
+        this.isValidated = false;
+    }
     /**
      * Execute a select operation.
      *
@@ -275,15 +334,11 @@ class OINODbPostgresql extends db_1.OINODb {
      *
      */
     async sqlSelect(sql) {
-        common_1.OINOBenchmark.startMetric("OINODb", "sqlSelect");
-        let result;
-        try {
-            const rows = await this._query(sql);
-            result = new OINOPostgresqlData(rows, []);
-        }
-        catch (e) {
-            result = new OINOPostgresqlData(db_1.OINODB_EMPTY_ROWS, [common_1.OINO_ERROR_PREFIX + " (sqlSelect): exception in _db.query [" + e.message + "]"]);
+        if (!this.isValidated) {
+            throw new Error(common_1.OINO_ERROR_PREFIX + ": Database connection not validated!");
         }
+        common_1.OINOBenchmark.startMetric("OINODb", "sqlSelect");
+        let result = await this._query(sql);
         common_1.OINOBenchmark.endMetric("OINODb", "sqlSelect");
         return result;
     }
@@ -294,15 +349,11 @@ class OINODbPostgresql extends db_1.OINODb {
      *
      */
     async sqlExec(sql) {
-        common_1.OINOBenchmark.startMetric("OINODb", "sqlExec");
-        let result;
-        try {
-            const rows = await this._exec(sql);
-            result = new OINOPostgresqlData(rows, []);
-        }
-        catch (e) {
-            result = new OINOPostgresqlData(db_1.OINODB_EMPTY_ROWS, [common_1.OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + e.message + "]"]);
+        if (!this.isValidated) {
+            throw new Error(common_1.OINO_ERROR_PREFIX + ": Database connection not validated!");
         }
+        common_1.OINOBenchmark.startMetric("OINODb", "sqlExec");
+        let result = await this._exec(sql);
         common_1.OINOBenchmark.endMetric("OINODb", "sqlExec");
         return result;
     }
@@ -359,7 +410,7 @@ WHERE col.table_catalog = '${dbName}'`;
      *
      */
     async initializeApiDatamodel(api) {
-        const schema_res = await this.sqlSelect(this._getSchemaSql(this._params.database, api.params.tableName.toLowerCase()));
+        const schema_res = await this._query(this._getSchemaSql(this._params.database, api.params.tableName.toLowerCase()));
         while (!schema_res.isEof()) {
             const row = schema_res.getRow();
             const field_name = row[0]?.toString() || "";

package/dist/esm/OINODbPostgresql.js

@@ -110,19 +110,56 @@ export class OINODbPostgresql extends OINODb {
         return result;
     }
     async _query(sql) {
-        const query_result = await this._pool.query({ rowMode: "array", text: sql });
-        return Promise.resolve(query_result.rows);
+        let connection = null;
+        try {
+            connection = await this._pool.connect();
+            const query_result = await connection.query({ rowMode: "array", text: sql });
+            let rows;
+            if (Array.isArray(query_result) == true) {
+                rows = query_result.flatMap((q) => q.rows);
+            }
+            else if (query_result.rows) {
+                rows = query_result.rows;
+            }
+            else {
+                rows = OINODB_EMPTY_ROWS; // return empty row if no rows returned
+            }
+            return new OINOPostgresqlData(rows, []);
+        }
+        catch (e) {
+            return new OINOPostgresqlData(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db query: " + e.message, "OINODbPostgresql._query");
+        }
+        finally {
+            if (connection) {
+                connection.release();
+            }
+        }
     }
     async _exec(sql) {
-        const query_result = await this._pool.query({ rowMode: "array", text: sql });
-        if (Array.isArray(query_result) == true) {
-            return Promise.resolve(query_result.flatMap((q) => q.rows));
+        let connection = null;
+        try {
+            connection = await this._pool.connect();
+            const query_result = await connection.query({ rowMode: "array", text: sql });
+            let rows;
+            if (Array.isArray(query_result) == true) {
+                rows = query_result.flatMap((q) => q.rows);
+            }
+            else if (query_result.rows) {
+                rows = query_result.rows;
+            }
+            else {
+                rows = OINODB_EMPTY_ROWS; // return empty row if no rows returned
+            }
+            // if (rows.length > 0) { console.log("OINODbPostgresql._exec: rows", rows) }
+            return new OINOPostgresqlData(rows, []);
         }
-        else if (query_result.rows) {
-            return Promise.resolve(query_result.rows);
+        catch (e) {
+            return new OINOPostgresqlData(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db exec: " + e.message, "OINODbPostgresql._exec");
         }
-        else {
-            return Promise.resolve(OINODB_EMPTY_ROWS); // return empty row if no rows returned
+        finally {
+            if (connection) {
+                connection.release();
+            }
         }
     }
     /**
@@ -224,15 +261,24 @@ export class OINODbPostgresql extends OINODb {
      */
     async connect() {
         let result = new OINOResult();
+        if (this.isConnected) {
+            return result;
+        }
+        let connection = null;
         try {
             // make sure that any items are correctly URL encoded in the connection string
-            await this._pool.connect();
+            connection = await this._pool.connect();
             this.isConnected = true;
         }
         catch (e) {
             result.setError(500, "Exception connecting to database: " + e.message, "OINODbPostgresql.connect");
             OINOLog.exception("@oino-ts/db-postgresql", "OINODbPostgresql", "connect", "exception in connect", { message: e.message, stack: e.stack });
         }
+        finally {
+            if (connection) {
+                connection.release();
+            }
+        }
         return result;
     }
     /**
@@ -244,7 +290,7 @@ export class OINODbPostgresql extends OINODb {
         let result = new OINOResult();
         try {
             const sql = this._getValidateSql(this._params.database);
-            const sql_res = await this.sqlSelect(sql);
+            const sql_res = await this._query(sql);
             if (sql_res.isEmpty()) {
                 result.setError(400, "DB returned no rows for select!", "OINODbPostgresql.validate");
             }
@@ -265,6 +311,19 @@ export class OINODbPostgresql extends OINODb {
         OINOBenchmark.endMetric("OINODb", "validate");
         return result;
     }
+    /**
+     * Disconnect from database.
+     *
+     */
+    async disconnect() {
+        if (this.isConnected) {
+            this._pool.end().catch((e) => {
+                OINOLog.exception("@oino-ts/db-postgresql", "OINODbPostgresql", "disconnect", "exception in pool end", { message: e.message, stack: e.stack });
+            });
+        }
+        this.isConnected = false;
+        this.isValidated = false;
+    }
     /**
      * Execute a select operation.
      *
@@ -272,15 +331,11 @@ export class OINODbPostgresql extends OINODb {
      *
      */
     async sqlSelect(sql) {
-        OINOBenchmark.startMetric("OINODb", "sqlSelect");
-        let result;
-        try {
-            const rows = await this._query(sql);
-            result = new OINOPostgresqlData(rows, []);
-        }
-        catch (e) {
-            result = new OINOPostgresqlData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlSelect): exception in _db.query [" + e.message + "]"]);
+        if (!this.isValidated) {
+            throw new Error(OINO_ERROR_PREFIX + ": Database connection not validated!");
         }
+        OINOBenchmark.startMetric("OINODb", "sqlSelect");
+        let result = await this._query(sql);
         OINOBenchmark.endMetric("OINODb", "sqlSelect");
         return result;
     }
@@ -291,15 +346,11 @@ export class OINODbPostgresql extends OINODb {
      *
      */
     async sqlExec(sql) {
-        OINOBenchmark.startMetric("OINODb", "sqlExec");
-        let result;
-        try {
-            const rows = await this._exec(sql);
-            result = new OINOPostgresqlData(rows, []);
-        }
-        catch (e) {
-            result = new OINOPostgresqlData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + e.message + "]"]);
+        if (!this.isValidated) {
+            throw new Error(OINO_ERROR_PREFIX + ": Database connection not validated!");
         }
+        OINOBenchmark.startMetric("OINODb", "sqlExec");
+        let result = await this._exec(sql);
         OINOBenchmark.endMetric("OINODb", "sqlExec");
         return result;
     }
@@ -356,7 +407,7 @@ WHERE col.table_catalog = '${dbName}'`;
      *
      */
     async initializeApiDatamodel(api) {
-        const schema_res = await this.sqlSelect(this._getSchemaSql(this._params.database, api.params.tableName.toLowerCase()));
+        const schema_res = await this._query(this._getSchemaSql(this._params.database, api.params.tableName.toLowerCase()));
         while (!schema_res.isEof()) {
             const row = schema_res.getRow();
             const field_name = row[0]?.toString() || "";

package/dist/types/OINODbPostgresql.d.ts

@@ -63,6 +63,11 @@ export declare class OINODbPostgresql extends OINODb {
      *
      */
     validate(): Promise<OINOResult>;
+    /**
+     * Disconnect from database.
+     *
+     */
+    disconnect(): Promise<void>;
     /**
      * Execute a select operation.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db-postgresql",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "OINO TS package for using Postgresql databases.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -20,7 +20,7 @@
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "dependencies": {
-    "@oino-ts/db": "0.19.0",
+    "@oino-ts/db": "0.20.0",
     "pg": "^8.11.3"
   },
   "devDependencies": {

package/src/OINODbPostgresql.ts

@@ -7,7 +7,7 @@
 import { OINO_ERROR_PREFIX, OINOBenchmark, OINOLog, OINOResult } from "@oino-ts/common";
 import { OINODb, OINODbParams, OINODbDataSet, OINODbApi, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINODbDataFieldParams, OINODataRow, OINODataCell, OINODatetimeDataField, OINOBlobDataField, OINODB_EMPTY_ROW, OINODB_EMPTY_ROWS } from "@oino-ts/db";
 
-import { Pool, QueryResult } from "pg";
+import { Pool, PoolClient, QueryResult } from "pg";
 
 
 /**
@@ -124,19 +124,50 @@ export class OINODbPostgresql extends OINODb {
         return result
     }
 
-    private async _query(sql:string):Promise<OINODataRow[]> {
-        const query_result:QueryResult = await this._pool.query({rowMode: "array", text: sql})
-        return Promise.resolve(query_result.rows)
+    private async _query(sql:string):Promise<OINODbDataSet> {
+        let connection:PoolClient|null = null
+        try {
+            connection = await this._pool.connect()
+            const query_result = await connection.query({rowMode: "array", text: sql})
+            let rows:OINODataRow[]
+            if (Array.isArray(query_result) == true) {
+                rows = query_result.flatMap((q) => q.rows)
+            } else if (query_result.rows) {
+                rows = query_result.rows
+            } else {
+                rows = OINODB_EMPTY_ROWS // return empty row if no rows returned
+            }
+            return new OINOPostgresqlData(rows, [])
+        } catch (e:any) {
+            return new OINOPostgresqlData(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db query: " + e.message, "OINODbPostgresql._query") as OINOPostgresqlData
+        } finally {
+            if (connection) {
+                connection.release()
+            }
+        }
     }
 
-    private async _exec(sql:string):Promise<OINODataRow[]> {
-        const query_result:QueryResult = await this._pool.query({rowMode: "array", text: sql})
-        if (Array.isArray(query_result) == true) {
-            return Promise.resolve(query_result.flatMap((q) => q.rows))
-        } else if (query_result.rows) {
-            return Promise.resolve(query_result.rows)
-        } else {
-            return Promise.resolve(OINODB_EMPTY_ROWS) // return empty row if no rows returned
+    private async _exec(sql:string):Promise<OINODbDataSet> {
+        let connection:PoolClient|null = null
+        try {
+            connection = await this._pool.connect()
+            const query_result:QueryResult = await connection.query({rowMode: "array", text: sql})
+            let rows:OINODataRow[]
+            if (Array.isArray(query_result) == true) {
+                rows = query_result.flatMap((q) => q.rows)
+            } else if (query_result.rows) {
+                rows = query_result.rows
+            } else {
+                rows = OINODB_EMPTY_ROWS // return empty row if no rows returned
+            }
+            // if (rows.length > 0) { console.log("OINODbPostgresql._exec: rows", rows) }
+            return new OINOPostgresqlData(rows, [])
+        } catch (e:any) {
+            return new OINOPostgresqlData(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db exec: " + e.message, "OINODbPostgresql._exec") as OINOPostgresqlData
+        } finally {
+            if (connection) {
+                connection.release()
+            }
         }
     }
 
@@ -243,15 +274,24 @@ export class OINODbPostgresql extends OINODb {
      */
     async connect(): Promise<OINOResult> {
         let result:OINOResult = new OINOResult()
+        if (this.isConnected) {
+            return result
+        }
+        let connection:PoolClient|null = null
         try {
             // make sure that any items are correctly URL encoded in the connection string
-            await this._pool.connect()
+            connection = await this._pool.connect()
             this.isConnected = true
 
         } catch (e:any) {
             result.setError(500, "Exception connecting to database: " + e.message, "OINODbPostgresql.connect")
             OINOLog.exception("@oino-ts/db-postgresql", "OINODbPostgresql", "connect", "exception in connect", {message:e.message, stack:e.stack}) 
-        }        
+        } finally {
+            if (connection) {
+                connection.release()
+            }
+        }
+
         return result
     }
 
@@ -264,7 +304,7 @@ export class OINODbPostgresql extends OINODb {
         let result:OINOResult = new OINOResult()
         try {
             const sql = this._getValidateSql(this._params.database)
-            const sql_res:OINODbDataSet = await this.sqlSelect(sql)
+            const sql_res:OINODbDataSet = await this._query(sql)
             if (sql_res.isEmpty()) {
                 result.setError(400, "DB returned no rows for select!", "OINODbPostgresql.validate")
 
@@ -285,6 +325,21 @@ export class OINODbPostgresql extends OINODb {
         return result
     }
 
+    /**
+     * Disconnect from database.
+     *
+     */
+    async disconnect(): Promise<void> {
+        if (this.isConnected) {
+            this._pool.end().catch((e:any) => {
+                OINOLog.exception("@oino-ts/db-postgresql", "OINODbPostgresql", "disconnect", "exception in pool end", {message:e.message, stack:e.stack}) 
+            })
+        }
+        this.isConnected = false
+        this.isValidated = false
+    }
+
+
     /**
      * Execute a select operation.
      * 
@@ -292,15 +347,11 @@ export class OINODbPostgresql extends OINODb {
      *
      */
     async sqlSelect(sql:string): Promise<OINODbDataSet> {
-        OINOBenchmark.startMetric("OINODb", "sqlSelect")
-        let result:OINODbDataSet
-        try {
-            const rows:OINODataRow[] = await this._query(sql)
-            result = new OINOPostgresqlData(rows, [])
-
-        } catch (e:any) {
-            result = new OINOPostgresqlData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlSelect): exception in _db.query [" + e.message + "]"])
+        if (!this.isValidated) {
+            throw new Error(OINO_ERROR_PREFIX + ": Database connection not validated!")
         }
+        OINOBenchmark.startMetric("OINODb", "sqlSelect")
+        let result:OINODbDataSet = await this._query(sql)
         OINOBenchmark.endMetric("OINODb", "sqlSelect")
         return result
     }
@@ -312,15 +363,11 @@ export class OINODbPostgresql extends OINODb {
      *
      */
     async sqlExec(sql:string): Promise<OINODbDataSet> {
-        OINOBenchmark.startMetric("OINODb", "sqlExec")
-        let result:OINODbDataSet
-        try {
-            const rows:OINODataRow[] = await this._exec(sql)
-            result = new OINOPostgresqlData(rows, [])
-
-        } catch (e:any) {
-            result = new OINOPostgresqlData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + e.message + "]"])
+        if (!this.isValidated) {
+            throw new Error(OINO_ERROR_PREFIX + ": Database connection not validated!")
         }
+        OINOBenchmark.startMetric("OINODb", "sqlExec")
+        let result:OINODbDataSet = await this._exec(sql)
         OINOBenchmark.endMetric("OINODb", "sqlExec")
         return result
     }
@@ -383,7 +430,7 @@ WHERE col.table_catalog = '${dbName}'`
      */
     async initializeApiDatamodel(api:OINODbApi): Promise<void> {
         
-        const schema_res:OINODbDataSet = await this.sqlSelect(this._getSchemaSql(this._params.database, api.params.tableName.toLowerCase()))
+        const schema_res:OINODbDataSet = await this._query(this._getSchemaSql(this._params.database, api.params.tableName.toLowerCase()))
         while (!schema_res.isEof()) {
             const row:OINODataRow = schema_res.getRow()
             const field_name:string = row[0]?.toString() || ""