@oino-ts/db-mariadb 0.18.1 → 0.20.0

package/dist/cjs/OINODbMariadb.js

@@ -6,6 +6,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OINODbMariadb = void 0;
+const common_1 = require("@oino-ts/common");
 const db_1 = require("@oino-ts/db");
 const mariadb_1 = require("mariadb");
 /**
@@ -21,7 +22,7 @@ class OINOMariadbData extends db_1.OINODbDataSet {
     constructor(data, messages = []) {
         super(data, messages);
         if (data == null) {
-            this.messages.push(db_1.OINO_INFO_PREFIX + "SQL result is empty");
+            this.messages.push(common_1.OINO_INFO_PREFIX + "SQL result is empty");
         }
         else if (Array.isArray(data)) {
             this._rows = data;
@@ -100,7 +101,7 @@ class OINODbMariadb extends db_1.OINODb {
     constructor(params) {
         super(params);
         if (this._params.type !== "OINODbMariadb") {
-            throw new Error(db_1.OINO_ERROR_PREFIX + ": Not OINODbMariadb-type: " + this._params.type);
+            throw new Error(common_1.OINO_ERROR_PREFIX + ": Not OINODbMariadb-type: " + this._params.type);
         }
         this._pool = mariadb_1.default.createPool({ host: this._params.url, database: this._params.database, port: this._params.port, user: this._params.user, password: this._params.password, acquireTimeout: 2000, debug: false, rowsAsArray: true, multipleStatements: true });
         delete this._params.password; // do not store password in db object
@@ -114,30 +115,48 @@ class OINODbMariadb extends db_1.OINODb {
     }
     async _query(sql) {
         let connection = null;
+        let rows = db_1.OINODB_EMPTY_ROWS;
         try {
             connection = await this._pool.getConnection();
-            const result = await connection.query(sql);
-            return Promise.resolve(result);
+            const sql_res = await connection.query(sql);
+            // console.log("_query: sql=", sql, " result=", result)
+            if (Array.isArray(sql_res)) {
+                rows = sql_res.filter((r) => Array.isArray(r)); // filter out OkPacket results from multiple statements
+            }
+        }
+        catch (e) {
+            common_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "_query", "exception in SQL select", { message: e.message, stack: e.stack });
+            return new OINOMariadbData(db_1.OINODB_EMPTY_ROWS, []).setError(500, common_1.OINO_ERROR_PREFIX + ": Exception in db query: " + e.message, "OINODbMariadb._query");
         }
         finally {
             if (connection) {
-                await connection.end();
+                connection.release();
             }
         }
+        return new OINOMariadbData(rows, []);
     }
     async _exec(sql) {
         let connection = null;
+        let rows = db_1.OINODB_EMPTY_ROWS;
         try {
             connection = await this._pool.getConnection();
-            const result = await connection.query(sql);
-            // console.log(result); 
-            return Promise.resolve(result);
+            const sql_res = await connection.query(sql);
+            // console.log("OINODbMariadb._exec: result=", result)
+            if (Array.isArray(sql_res)) {
+                rows = sql_res.filter((r) => Array.isArray(r)); // filter out OkPacket results from multiple statements
+            }
+        }
+        catch (e) {
+            const msg_parts = e.message.match(OINODbMariadb._sqlExceptionMessageRegex) || [];
+            common_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "_exec", "exception in SQL exec", { message: msg_parts[2], stack: e.stack });
+            return new OINOMariadbData(db_1.OINODB_EMPTY_ROWS, []).setError(500, common_1.OINO_ERROR_PREFIX + ": Exception in db exec [" + msg_parts[2] + "]", "OINODbMariadb._exec");
         }
         finally {
             if (connection) {
-                await connection.end();
+                connection.release();
             }
         }
+        return new OINOMariadbData(rows, []);
     }
     /**
      * Print a table name using database specific SQL escaping.
@@ -253,7 +272,10 @@ class OINODbMariadb extends db_1.OINODb {
      *
      */
     async connect() {
-        const 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
@@ -263,11 +285,11 @@ class OINODbMariadb extends db_1.OINODb {
         catch (e) {
             const msg_parts = e.message.match(OINODbMariadb._connectionExceptionMessageRegex) || [];
             result.setError(500, "Error connecting to server: " + msg_parts[2], "OINODbMariadb.connect");
-            db_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "connect", "exception in connect", { message: e.message, stack: e.stack });
+            common_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "connect", "exception in connect", { message: e.message, stack: e.stack });
         }
         finally {
             if (connection) {
-                await connection.end();
+                await connection.release();
             }
         }
         return Promise.resolve(result);
@@ -277,11 +299,11 @@ class OINODbMariadb 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!", "OINODbMariadb.validate");
             }
@@ -297,11 +319,22 @@ class OINODbMariadb extends db_1.OINODb {
         }
         catch (e) {
             result.setError(500, "Exception validating connection: " + e.message, "OINODbMariadb.validate");
-            db_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "validate", "exception in validate", { message: e.message, stack: e.stack });
+            common_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "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) {
+            await this._pool.end();
+        }
+        this.isConnected = false;
+        this.isValidated = false;
+    }
     /**
      * Execute a select operation.
      *
@@ -309,17 +342,12 @@ class OINODbMariadb extends db_1.OINODb {
      *
      */
     async sqlSelect(sql) {
-        db_1.OINOBenchmark.startMetric("OINODb", "sqlSelect");
-        let result;
-        try {
-            const rows = await this._query(sql);
-            result = new OINOMariadbData(rows, []);
-        }
-        catch (e) {
-            db_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlSelect", "exception in SQL select", { message: e.message, stack: e.stack });
-            result = new OINOMariadbData(db_1.OINODB_EMPTY_ROWS, [db_1.OINO_ERROR_PREFIX + " (sqlSelect): OINODbMariadb.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;
     }
     /**
@@ -329,18 +357,12 @@ class OINODbMariadb extends db_1.OINODb {
      *
      */
     async sqlExec(sql) {
-        db_1.OINOBenchmark.startMetric("OINODb", "sqlExec");
-        let result;
-        try {
-            const sql_res = await this._exec(sql);
-            result = new OINOMariadbData(sql_res, []);
-        }
-        catch (e) {
-            const msg_parts = e.message.match(OINODbMariadb._sqlExceptionMessageRegex) || [];
-            db_1.OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlExec", "exception in SQL exec", { message: msg_parts[2], stack: e.stack });
-            result = new OINOMariadbData(db_1.OINODB_EMPTY_ROWS, [db_1.OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + msg_parts[2] + "]"]);
+        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) {
@@ -374,7 +396,7 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`;
      *
      */
     async initializeApiDatamodel(api) {
-        const schema_res = await this.sqlSelect(this._getSchemaSql(this._params.database, api.params.tableName));
+        const schema_res = await this._query(this._getSchemaSql(this._params.database, api.params.tableName));
         while (!schema_res.isEof()) {
             const row = schema_res.getRow();
             // console.log("OINODbMariadb.initializeApiDatamodel row", row)
@@ -391,9 +413,9 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`;
                 isNotNull: row[2] == "NO"
             };
             if (api.isFieldIncluded(field_name) == false) {
-                db_1.OINOLog.info("@oino-ts/db-mariadb", "OINODbMariadb", ".initializeApiDatamodel", "Field excluded in API parameters", { field: field_name });
+                common_1.OINOLog.info("@oino-ts/db-mariadb", "OINODbMariadb", ".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 {
@@ -426,13 +448,13 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`;
                     }
                 }
                 else {
-                    db_1.OINOLog.info("@oino-ts/db-mariadb", "OINODbMariadb", "initializeApiDatamodel", "Unrecognized field type treated as string", { field_name: field_name, sql_type: sql_type, field_length1: field_length1, field_length2: field_length2, field_params: field_params });
+                    common_1.OINOLog.info("@oino-ts/db-mariadb", "OINODbMariadb", "initializeApiDatamodel", "Unrecognized field type treated as string", { field_name: field_name, sql_type: sql_type, field_length1: field_length1, field_length2: field_length2, 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-mariadb", "OINODbMariadb", "initializeApiDatamodel", "\n" + api.datamodel.printDebug("\n"));
+        common_1.OINOLog.info("@oino-ts/db-mariadb", "OINODbMariadb", "initializeApiDatamodel", "\n" + api.datamodel.printDebug("\n"));
         return Promise.resolve();
     }
 }

package/dist/esm/OINODbMariadb.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, OINO_INFO_PREFIX, OINODB_EMPTY_ROW, OINODB_EMPTY_ROWS, OINOLog, OINOResult } from "@oino-ts/db";
+import { OINO_ERROR_PREFIX, OINOBenchmark, OINO_INFO_PREFIX, 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 mariadb from "mariadb";
 /**
  * Implmentation of OINODbDataSet for MariaDb.
@@ -111,30 +112,48 @@ export class OINODbMariadb extends OINODb {
     }
     async _query(sql) {
         let connection = null;
+        let rows = OINODB_EMPTY_ROWS;
         try {
             connection = await this._pool.getConnection();
-            const result = await connection.query(sql);
-            return Promise.resolve(result);
+            const sql_res = await connection.query(sql);
+            // console.log("_query: sql=", sql, " result=", result)
+            if (Array.isArray(sql_res)) {
+                rows = sql_res.filter((r) => Array.isArray(r)); // filter out OkPacket results from multiple statements
+            }
+        }
+        catch (e) {
+            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "_query", "exception in SQL select", { message: e.message, stack: e.stack });
+            return new OINOMariadbData(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db query: " + e.message, "OINODbMariadb._query");
         }
         finally {
             if (connection) {
-                await connection.end();
+                connection.release();
             }
         }
+        return new OINOMariadbData(rows, []);
     }
     async _exec(sql) {
         let connection = null;
+        let rows = OINODB_EMPTY_ROWS;
         try {
             connection = await this._pool.getConnection();
-            const result = await connection.query(sql);
-            // console.log(result); 
-            return Promise.resolve(result);
+            const sql_res = await connection.query(sql);
+            // console.log("OINODbMariadb._exec: result=", result)
+            if (Array.isArray(sql_res)) {
+                rows = sql_res.filter((r) => Array.isArray(r)); // filter out OkPacket results from multiple statements
+            }
+        }
+        catch (e) {
+            const msg_parts = e.message.match(OINODbMariadb._sqlExceptionMessageRegex) || [];
+            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "_exec", "exception in SQL exec", { message: msg_parts[2], stack: e.stack });
+            return new OINOMariadbData(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db exec [" + msg_parts[2] + "]", "OINODbMariadb._exec");
         }
         finally {
             if (connection) {
-                await connection.end();
+                connection.release();
             }
         }
+        return new OINOMariadbData(rows, []);
     }
     /**
      * Print a table name using database specific SQL escaping.
@@ -250,7 +269,10 @@ export class OINODbMariadb extends OINODb {
      *
      */
     async connect() {
-        const result = new OINOResult();
+        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
@@ -264,7 +286,7 @@ export class OINODbMariadb extends OINODb {
         }
         finally {
             if (connection) {
-                await connection.end();
+                await connection.release();
             }
         }
         return Promise.resolve(result);
@@ -278,7 +300,7 @@ export class OINODbMariadb 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!", "OINODbMariadb.validate");
             }
@@ -299,6 +321,17 @@ export class OINODbMariadb extends OINODb {
         OINOBenchmark.endMetric("OINODb", "validate");
         return result;
     }
+    /**
+     * Disconnect from database.
+     *
+     */
+    async disconnect() {
+        if (this.isConnected) {
+            await this._pool.end();
+        }
+        this.isConnected = false;
+        this.isValidated = false;
+    }
     /**
      * Execute a select operation.
      *
@@ -306,16 +339,11 @@ export class OINODbMariadb extends OINODb {
      *
      */
     async sqlSelect(sql) {
-        OINOBenchmark.startMetric("OINODb", "sqlSelect");
-        let result;
-        try {
-            const rows = await this._query(sql);
-            result = new OINOMariadbData(rows, []);
-        }
-        catch (e) {
-            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlSelect", "exception in SQL select", { message: e.message, stack: e.stack });
-            result = new OINOMariadbData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlSelect): OINODbMariadb.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;
     }
@@ -326,17 +354,11 @@ export class OINODbMariadb extends OINODb {
      *
      */
     async sqlExec(sql) {
-        OINOBenchmark.startMetric("OINODb", "sqlExec");
-        let result;
-        try {
-            const sql_res = await this._exec(sql);
-            result = new OINOMariadbData(sql_res, []);
-        }
-        catch (e) {
-            const msg_parts = e.message.match(OINODbMariadb._sqlExceptionMessageRegex) || [];
-            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlExec", "exception in SQL exec", { message: msg_parts[2], stack: e.stack });
-            result = new OINOMariadbData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + msg_parts[2] + "]"]);
+        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;
     }
@@ -371,7 +393,7 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`;
      *
      */
     async initializeApiDatamodel(api) {
-        const schema_res = await this.sqlSelect(this._getSchemaSql(this._params.database, api.params.tableName));
+        const schema_res = await this._query(this._getSchemaSql(this._params.database, api.params.tableName));
         while (!schema_res.isEof()) {
             const row = schema_res.getRow();
             // console.log("OINODbMariadb.initializeApiDatamodel row", row)

package/dist/types/OINODbMariadb.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 MariaDb/MySql-database.
  *
@@ -65,6 +66,11 @@ export declare class OINODbMariadb 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-mariadb",
-  "version": "0.18.1",
+  "version": "0.20.0",
   "description": "OINO TS package for using Mariadb databases.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -21,7 +21,8 @@
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "dependencies": {
-    "@oino-ts/db": "^0.18.1",
+    "@oino-ts/common": "^0.20.0",
+    "@oino-ts/db": "^0.20.0",
     "mariadb": "^3.2.3"
   },
   "devDependencies": {

package/src/OINODbMariadb.ts

@@ -4,7 +4,8 @@
  * 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, OINO_INFO_PREFIX, OINODB_EMPTY_ROW, OINODB_EMPTY_ROWS, OINOLog, OINOResult } from "@oino-ts/db";
+import { OINO_ERROR_PREFIX, OINOBenchmark, OINO_INFO_PREFIX, 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 mariadb from "mariadb";
 
@@ -124,33 +125,50 @@ export class OINODbMariadb extends OINODb {
         return result
     }
 
-    private async _query(sql:string):Promise<OINODataRow[]> {
-        let connection:mariadb.Connection|null = null
+    private async _query(sql:string):Promise<OINODbDataSet> {
+        let connection:mariadb.PoolConnection|null = null
+        let rows:OINODataRow[] = OINODB_EMPTY_ROWS
         try {
-            connection = await this._pool.getConnection();
-            const result = await connection.query(sql);
-            return Promise.resolve(result)
-        
+            connection = await this._pool.getConnection()
+            const sql_res = await connection.query(sql)
+            // console.log("_query: sql=", sql, " result=", result)
+            if (Array.isArray(sql_res)) {
+                rows = sql_res.filter((r) => Array.isArray(r)) as OINODataRow[] // filter out OkPacket results from multiple statements
+            }
+        } catch (e:any) {
+            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "_query", "exception in SQL select", {message:e.message, stack:e.stack})
+            return new OINOMariadbData(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db query: " + e.message, "OINODbMariadb._query") as OINOMariadbData 
+
         } finally {
             if (connection) {
-                await connection.end()
+                connection.release()
             }
         }
+        return new OINOMariadbData(rows, [])
     }
 
-    private async _exec(sql:string):Promise<any> {
-        let connection:mariadb.Connection|null = null
+    private async _exec(sql:string):Promise<OINODbDataSet> {
+        let connection:mariadb.PoolConnection|null = null
+        let rows:OINODataRow[] = OINODB_EMPTY_ROWS
         try {
-            connection = await this._pool.getConnection();
-            const result = await connection.query(sql);
-            // console.log(result); 
-            return Promise.resolve(result)
+            connection = await this._pool.getConnection()
+            const sql_res = await connection.query(sql)
+            // console.log("OINODbMariadb._exec: result=", result)
+            if (Array.isArray(sql_res)) {
+                rows = sql_res.filter((r) => Array.isArray(r)) // filter out OkPacket results from multiple statements
+            }
         
+        } catch (e:any) {
+            const msg_parts = e.message.match(OINODbMariadb._sqlExceptionMessageRegex) || []
+            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "_exec", "exception in SQL exec", {message:msg_parts[2], stack:e.stack})
+            return new OINOMariadbData(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db exec [" + msg_parts[2] + "]", "OINODbMariadb._exec") as OINOMariadbData
+
         } finally {
             if (connection) {
-                await connection.end()
+                connection.release()
             }
         }
+        return new OINOMariadbData(rows, [])
     }
 
     /**
@@ -270,8 +288,11 @@ export class OINODbMariadb extends OINODb {
      *
      */
     async connect(): Promise<OINOResult> {
-        const result:OINOResult = new OINOResult()
-        let connection:mariadb.Connection|null = null
+        let result:OINOResult = new OINOResult()
+        if (this.isConnected) {
+            return result
+        }
+        let connection:mariadb.PoolConnection|null = null
         try {
             // make sure that any items are correctly URL encoded in the connection string
             connection = await this._pool.getConnection()
@@ -283,7 +304,7 @@ export class OINODbMariadb extends OINODb {
             OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "connect", "exception in connect", {message:e.message, stack:e.stack})
         } finally {
             if (connection) {
-                await connection.end()
+                await connection.release()
             }
         }   
 
@@ -299,7 +320,7 @@ export class OINODbMariadb 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!", "OINODbMariadb.validate")
 
@@ -320,6 +341,18 @@ export class OINODbMariadb extends OINODb {
         return result
     }
 
+    /**
+     * Disconnect from database.
+     *
+     */
+    async disconnect(): Promise<void> {
+        if (this.isConnected) {
+            await this._pool.end()
+        }
+        this.isConnected = false
+        this.isValidated = false
+    }
+
     /**
      * Execute a select operation.
      * 
@@ -327,16 +360,11 @@ export class OINODbMariadb 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 OINOMariadbData(rows, [])
-
-        } catch (e:any) {
-            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlSelect", "exception in SQL select", {message:e.message, stack:e.stack})
-            result = new OINOMariadbData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlSelect): OINODbMariadb.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
     }
@@ -348,17 +376,11 @@ export class OINODbMariadb extends OINODb {
      *
      */
     async sqlExec(sql:string): Promise<OINODbDataSet> {
-        OINOBenchmark.startMetric("OINODb", "sqlExec")
-        let result:OINODbDataSet
-        try {
-            const sql_res:OINODataRow[] = await this._exec(sql)
-            result = new OINOMariadbData(sql_res, [])
-
-        } catch (e:any) {
-            const msg_parts = e.message.match(OINODbMariadb._sqlExceptionMessageRegex) || []
-            OINOLog.exception("@oino-ts/db-mariadb", "OINODbMariadb", "sqlExec", "exception in SQL exec", {message:msg_parts[2], stack:e.stack})
-            result = new OINOMariadbData(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (sqlExec): exception in _db.exec [" + msg_parts[2] + "]"])
+        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
     }
@@ -400,7 +422,7 @@ WHERE C.TABLE_SCHEMA = '${dbName}';`
      */
     async initializeApiDatamodel(api:OINODbApi): Promise<void> {
         
-        const schema_res:OINODbDataSet = await this.sqlSelect(this._getSchemaSql(this._params.database, api.params.tableName))
+        const schema_res:OINODbDataSet = await this._query(this._getSchemaSql(this._params.database, api.params.tableName))
         while (!schema_res.isEof()) {
             const row:OINODataRow = schema_res.getRow()
             // console.log("OINODbMariadb.initializeApiDatamodel row", row)