@oino-ts/db-postgresql 0.18.1 → 0.20.0

package/dist/cjs/OINODbPostgresql.js

@@ -6,6 +6,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OINODbPostgresql = void 0;
+const common_1 = require("@oino-ts/common");
 const db_1 = require("@oino-ts/db");
 const pg_1 = require("pg");
 /**
@@ -21,7 +22,7 @@ class OINOPostgresqlData extends db_1.OINODbDataSet {
     constructor(data, messages = []) {
         super(data, messages);
         if ((data != null) && !(Array.isArray(data))) {
-            throw new Error(db_1.OINO_ERROR_PREFIX + ": Invalid Posgresql data type!"); // TODO: maybe check all rows
+            throw new Error(common_1.OINO_ERROR_PREFIX + ": Invalid Posgresql data type!"); // TODO: maybe check all rows
         }
         this._rows = data;
         if (this.isEmpty()) {
@@ -95,13 +96,13 @@ class OINODbPostgresql extends db_1.OINODb {
     constructor(params) {
         super(params);
         if (this._params.type !== "OINODbPostgresql") {
-            throw new Error(db_1.OINO_ERROR_PREFIX + ": Not OINODbPostgresql-type: " + this._params.type);
+            throw new Error(common_1.OINO_ERROR_PREFIX + ": Not OINODbPostgresql-type: " + this._params.type);
         }
         const ssl_enabled = !(this._params.url == "localhost" || this._params.url == "127.0.0.1");
         this._pool = new pg_1.Pool({ host: this._params.url, database: this._params.database, port: this._params.port, user: this._params.user, password: this._params.password, ssl: ssl_enabled });
         delete this._params.password;
         this._pool.on("error", (err) => {
-            db_1.OINOLog.error("@oino-ts/db-postgresql", "OINODbPostgresql", ".on(error)", "Error-event", { err: err });
+            common_1.OINOLog.error("@oino-ts/db-postgresql", "OINODbPostgresql", ".on(error)", "Error-event", { err: err });
         });
     }
     _parseFieldLength(fieldLength) {
@@ -112,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();
+            }
         }
     }
     /**
@@ -225,15 +263,24 @@ class OINODbPostgresql extends db_1.OINODb {
      *
      */
     async connect() {
-        let result = new db_1.OINOResult();
+        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");
-            db_1.OINOLog.exception("@oino-ts/db-postgresql", "OINODbPostgresql", "connect", "exception in connect", { message: e.message, stack: e.stack });
+            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;
     }
@@ -242,11 +289,11 @@ class OINODbPostgresql extends db_1.OINODb {
      *
      */
     async validate() {
-        db_1.OINOBenchmark.startMetric("OINODb", "validate");
-        let result = new db_1.OINOResult();
+        common_1.OINOBenchmark.startMetric("OINODb", "validate");
+        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");
             }
@@ -262,11 +309,24 @@ class OINODbPostgresql extends db_1.OINODb {
         }
         catch (e) {
             result.setError(500, "Exception validating connection: " + e.message, "OINODbPostgresql.validate");
-            db_1.OINOLog.exception("@oino-ts/db-postgresql", "OINODbPostgresql", "validate", "exception in validate", { message: e.message, stack: e.stack });
+            common_1.OINOLog.exception("@oino-ts/db-postgresql", "OINODbPostgresql", "validate", "exception in validate", { message: e.message, stack: e.stack });
         }
-        db_1.OINOBenchmark.endMetric("OINODb", "validate");
+        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.
      *
@@ -274,16 +334,12 @@ class OINODbPostgresql extends db_1.OINODb {
      *
      */
     async sqlSelect(sql) {
-        db_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, [db_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!");
         }
-        db_1.OINOBenchmark.endMetric("OINODb", "sqlSelect");
+        common_1.OINOBenchmark.startMetric("OINODb", "sqlSelect");
+        let result = await this._query(sql);
+        common_1.OINOBenchmark.endMetric("OINODb", "sqlSelect");
         return result;
     }
     /**
@@ -293,16 +349,12 @@ class OINODbPostgresql extends db_1.OINODb {
      *
      */
     async sqlExec(sql) {
-        db_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, [db_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!");
         }
-        db_1.OINOBenchmark.endMetric("OINODb", "sqlExec");
+        common_1.OINOBenchmark.startMetric("OINODb", "sqlExec");
+        let result = await this._exec(sql);
+        common_1.OINOBenchmark.endMetric("OINODb", "sqlExec");
         return result;
     }
     _getSchemaSql(dbName, tableName) {
@@ -358,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() || "";
@@ -375,9 +427,9 @@ WHERE col.table_catalog = '${dbName}'`;
                 isAutoInc: default_val.startsWith("nextval(")
             };
             if (api.isFieldIncluded(field_name) == false) {
-                db_1.OINOLog.info("@oino-ts/db-postgresql", "OINODbPostgresql", "initializeApiDatamodel", "Field excluded in API parameters.", { field: field_name });
+                common_1.OINOLog.info("@oino-ts/db-postgresql", "OINODbPostgresql", "initializeApiDatamodel", "Field excluded in API parameters.", { field: field_name });
                 if (field_params.isPrimaryKey) {
-                    throw new Error(db_1.OINO_ERROR_PREFIX + "Primary key field excluded in API parameters: " + field_name);
+                    throw new Error(common_1.OINO_ERROR_PREFIX + "Primary key field excluded in API parameters: " + field_name);
                 }
             }
             else {
@@ -405,13 +457,13 @@ WHERE col.table_catalog = '${dbName}'`;
                     api.datamodel.addField(new db_1.OINOStringDataField(this, field_name, sql_type, field_params, numeric_precision + numeric_scale + 1));
                 }
                 else {
-                    db_1.OINOLog.info("@oino-ts/db-postgresql", "OINODbPostgresql", "initializeApiDatamodel", "Unrecognized field type treated as string", { field_name: field_name, sql_type: sql_type, field_length: field_length, field_params: field_params });
+                    common_1.OINOLog.info("@oino-ts/db-postgresql", "OINODbPostgresql", "initializeApiDatamodel", "Unrecognized field type treated as string", { field_name: field_name, sql_type: sql_type, field_length: field_length, field_params: field_params });
                     api.datamodel.addField(new db_1.OINOStringDataField(this, field_name, sql_type, field_params, 0));
                 }
             }
             await schema_res.next();
         }
-        db_1.OINOLog.info("@oino-ts/db-postgresql", "OINODbPostgresql", "initializeApiDatamodel", "\n" + api.datamodel.printDebug("\n"));
+        common_1.OINOLog.info("@oino-ts/db-postgresql", "OINODbPostgresql", "initializeApiDatamodel", "\n" + api.datamodel.printDebug("\n"));
         return Promise.resolve();
     }
 }

package/dist/esm/OINODbPostgresql.js

@@ -3,7 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-import { OINODb, OINODbDataSet, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINO_ERROR_PREFIX, OINOBenchmark, OINODatetimeDataField, OINOBlobDataField, OINOLog, OINOResult, OINODB_EMPTY_ROW, OINODB_EMPTY_ROWS } from "@oino-ts/db";
+import { OINO_ERROR_PREFIX, OINOBenchmark, OINOLog, OINOResult } from "@oino-ts/common";
+import { OINODb, OINODbDataSet, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINODatetimeDataField, OINOBlobDataField, OINODB_EMPTY_ROW, OINODB_EMPTY_ROWS } from "@oino-ts/db";
 import { Pool } from "pg";
 /**
  * Implmentation of OINODbDataSet for Postgresql.
@@ -109,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();
+            }
         }
     }
     /**
@@ -223,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;
     }
     /**
@@ -243,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");
             }
@@ -264,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.
      *
@@ -271,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;
     }
@@ -290,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;
     }
@@ -355,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

@@ -1,4 +1,5 @@
-import { OINODb, OINODbParams, OINODbDataSet, OINODbApi, OINODataCell, OINOResult } from "@oino-ts/db";
+import { OINOResult } from "@oino-ts/common";
+import { OINODb, OINODbParams, OINODbDataSet, OINODbApi, OINODataCell } from "@oino-ts/db";
 /**
  * Implementation of Postgresql-database.
  *
@@ -62,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.18.1",
+  "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.18.1",
+    "@oino-ts/db": "0.20.0",
     "pg": "^8.11.3"
   },
   "devDependencies": {

package/src/OINODbPostgresql.ts

@@ -4,9 +4,10 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { OINODb, OINODbParams, OINODbDataSet, OINODbApi, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINODbDataFieldParams, OINO_ERROR_PREFIX, OINODataRow, OINODataCell, OINOBenchmark, OINODatetimeDataField, OINOBlobDataField, OINOLog, OINOResult, OINODB_EMPTY_ROW, OINODB_EMPTY_ROWS } from "@oino-ts/db";
+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";
 
 
 /**
@@ -123,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()
+            }
         }
     }
 
@@ -242,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
     }
 
@@ -263,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")
 
@@ -284,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.
      * 
@@ -291,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
     }
@@ -311,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
     }
@@ -382,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() || ""