@oino-ts/db-bunsqlite 0.18.1 → 0.20.0

package/dist/cjs/OINODbBunSqlite.js

@@ -6,6 +6,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OINODbBunSqlite = void 0;
+const common_1 = require("@oino-ts/common");
 const db_1 = require("@oino-ts/db");
 const bun_sqlite_1 = require("bun:sqlite");
 /**
@@ -35,10 +36,10 @@ class OINODbBunSqlite extends db_1.OINODb {
         super(params);
         this._db = null;
         if (!this._params.url.startsWith("file://")) {
-            throw new Error(db_1.OINO_ERROR_PREFIX + ": OINODbBunSqlite url must be a file://-url!");
+            throw new Error(common_1.OINO_ERROR_PREFIX + ": OINODbBunSqlite url must be a file://-url!");
         }
         if (this._params.type !== "OINODbBunSqlite") {
-            throw new Error(db_1.OINO_ERROR_PREFIX + ": Not OINODbBunSqlite-type: " + this._params.type);
+            throw new Error(common_1.OINO_ERROR_PREFIX + ": Not OINODbBunSqlite-type: " + this._params.type);
         }
     }
     _parseDbFieldParams(fieldStr) {
@@ -151,8 +152,11 @@ class OINODbBunSqlite extends db_1.OINODb {
      *
      */
     async connect() {
-        db_1.OINOBenchmark.startMetric("OINODb", "connect");
-        let result = new db_1.OINOResult();
+        common_1.OINOBenchmark.startMetric("OINODb", "connect");
+        let result = new common_1.OINOResult();
+        if (this.isConnected) {
+            return result;
+        }
         const filepath = this._params.url.substring(7);
         try {
             this._db = bun_sqlite_1.Database.open(filepath, { create: true, readonly: false, readwrite: true });
@@ -160,9 +164,9 @@ class OINODbBunSqlite extends db_1.OINODb {
         }
         catch (e) {
             result.setError(500, "Exception connecting to database: " + e.message, "OINODbBunSqlite.connect");
-            db_1.OINOLog.exception("@oino-ts/db-bunsqlite", "OINODbBunSqlite", "connect", "exception in connect", { message: e.message, stack: e.stack });
+            common_1.OINOLog.exception("@oino-ts/db-bunsqlite", "OINODbBunSqlite", "connect", "exception in connect", { message: e.message, stack: e.stack });
         }
-        db_1.OINOBenchmark.endMetric("OINODb", "connect");
+        common_1.OINOBenchmark.endMetric("OINODb", "connect");
         return result;
     }
     /**
@@ -170,11 +174,15 @@ class OINODbBunSqlite extends db_1.OINODb {
      *
      */
     async validate() {
-        db_1.OINOBenchmark.startMetric("OINODb", "validate");
-        let result = new db_1.OINOResult();
+        if (!this.isConnected) {
+            return new common_1.OINOResult().setError(400, "Database not connected!", "OINODbBunSqlite.validate");
+        }
+        common_1.OINOBenchmark.startMetric("OINODb", "validate");
+        let result = new common_1.OINOResult();
         try {
+            this.isValidated = false;
             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!", "OINODbBunSqlite.validate");
             }
@@ -189,28 +197,67 @@ class OINODbBunSqlite extends db_1.OINODb {
             }
         }
         catch (e) {
-            result.setError(500, db_1.OINO_ERROR_PREFIX + " (validate): OINODbBunSqlite.validate exception in _db.query: " + e.message, "OINODbBunSqlite.validate");
+            result.setError(500, common_1.OINO_ERROR_PREFIX + " (OINODbBunSqlite.validate): Exception in db query: " + e.message, "OINODbBunSqlite.validate");
         }
-        db_1.OINOBenchmark.endMetric("OINODb", "validate");
+        common_1.OINOBenchmark.endMetric("OINODb", "validate");
         return result;
     }
     /**
-     * Execute a select operation.
-     *
-     * @param sql SQL statement.
+     * Connect to database.
      *
      */
-    async sqlSelect(sql) {
-        db_1.OINOBenchmark.startMetric("OINODb", "sqlSelect");
+    async disconnect() {
+        this.isConnected = false;
+        this.isValidated = false;
+    }
+    async _query(sql) {
         let result;
         try {
-            result = new OINOBunSqliteDataset(this._db?.query(sql).values(), []);
+            const sql_res = this._db?.query(sql).values();
+            if (sql_res) {
+                // console.log("OINODbBunSqlite._query: res", sql_res)
+                result = new OINOBunSqliteDataset(sql_res, []);
+            }
+            else {
+                result = new OINOBunSqliteDataset(db_1.OINODB_EMPTY_ROWS, []);
+            }
         }
         catch (e) {
-            result = new OINOBunSqliteDataset(db_1.OINODB_EMPTY_ROWS, ["OINODbBunSqlite.sqlSelect exception in _db.query: " + e.message]);
+            result = new OINOBunSqliteDataset(db_1.OINODB_EMPTY_ROWS, []).setError(500, common_1.OINO_ERROR_PREFIX + " (OINODbBunSqlite._query): Exception in db query: " + e.message, "OINODbBunSqlite._query");
         }
-        db_1.OINOBenchmark.endMetric("OINODb", "sqlSelect");
-        return Promise.resolve(result);
+        return result;
+    }
+    async _exec(sql) {
+        let result;
+        try {
+            const sql_res = this._db?.query(sql).values();
+            if (sql_res) {
+                // console.log("OINODbBunSqlite._exec: res", sql_res)
+                result = new OINOBunSqliteDataset(sql_res, []);
+            }
+            else {
+                result = new OINOBunSqliteDataset(db_1.OINODB_EMPTY_ROWS, []);
+            }
+        }
+        catch (e) {
+            result = new OINOBunSqliteDataset(db_1.OINODB_EMPTY_ROWS, []).setError(500, common_1.OINO_ERROR_PREFIX + ": Exception in db exec: " + e.message, "OINODbBunSqlite._exec");
+        }
+        return result;
+    }
+    /**
+     * Execute a select operation.
+     *
+     * @param sql SQL statement.
+     *
+     */
+    async sqlSelect(sql) {
+        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;
     }
     /**
      * Execute other sql operations.
@@ -219,17 +266,13 @@ class OINODbBunSqlite extends db_1.OINODb {
      *
      */
     async sqlExec(sql) {
-        db_1.OINOBenchmark.startMetric("OINODb", "sqlExec");
-        let result;
-        try {
-            this._db?.exec(sql);
-            result = new OINOBunSqliteDataset(db_1.OINODB_EMPTY_ROWS, []);
-        }
-        catch (e) {
-            result = new OINOBunSqliteDataset(db_1.OINODB_EMPTY_ROWS, [db_1.OINO_ERROR_PREFIX + "(sqlExec): exception in _db.exec [" + e.message + "]"]);
+        if (!this.isValidated) {
+            return new OINOBunSqliteDataset(db_1.OINODB_EMPTY_ROWS, [common_1.OINO_ERROR_PREFIX + " (OINODbBunSqlite.sqlExec): Database connection not validated!"]);
         }
-        db_1.OINOBenchmark.endMetric("OINODb", "sqlExec");
-        return Promise.resolve(result);
+        common_1.OINOBenchmark.startMetric("OINODb", "sqlExec");
+        let result = await this._exec(sql);
+        common_1.OINOBenchmark.endMetric("OINODb", "sqlExec");
+        return result;
     }
     _getSchemaSql(dbName, tableName) {
         const sql = "SELECT sql from sqlite_schema WHERE name='" + tableName + "'";
@@ -248,7 +291,7 @@ class OINODbBunSqlite extends db_1.OINODb {
      */
     async initializeApiDatamodel(api) {
         const schema_sql = this._getSchemaSql(this._params.database, api.params.tableName);
-        const res = await this.sqlSelect(schema_sql);
+        const res = await this._query(schema_sql);
         const sql_desc = (res?.getRow()[0]);
         const excluded_fields = [];
         let table_matches = OINODbBunSqlite._tableDescriptionRegex.exec(sql_desc);
@@ -256,7 +299,7 @@ class OINODbBunSqlite extends db_1.OINODb {
             throw new Error("Table " + api.params.tableName + " not recognized as a valid Sqlite table!");
         }
         else {
-            let field_strings = db_1.OINOStr.splitExcludingBrackets(table_matches[1], ',', '(', ')');
+            let field_strings = common_1.OINOStr.splitExcludingBrackets(table_matches[1], ',', '(', ')');
             for (let field_str of field_strings) {
                 field_str = field_str.trim();
                 let field_params = this._parseDbFieldParams(field_str);
@@ -270,7 +313,7 @@ class OINODbBunSqlite extends db_1.OINODb {
                         for (let i = 0; i < primary_keys.length; i++) {
                             const pk = primary_keys[i].trim(); //..the trim
                             if (excluded_fields.indexOf(pk) >= 0) {
-                                throw new Error(db_1.OINO_ERROR_PREFIX + "Primary key field excluded in API parameters: " + pk);
+                                throw new Error(common_1.OINO_ERROR_PREFIX + "Primary key field excluded in API parameters: " + pk);
                             }
                             for (let j = 0; j < api.datamodel.fields.length; j++) {
                                 if (api.datamodel.fields[j].name == pk) {
@@ -288,7 +331,7 @@ class OINODbBunSqlite extends db_1.OINODb {
                         }
                     }
                     else {
-                        db_1.OINOLog.info("@oino-ts/db-bunsqlite", "OINODbBunSqlite", "initializeApiDatamodel", "Unsupported field definition skipped.", { field: field_str });
+                        common_1.OINOLog.info("@oino-ts/db-bunsqlite", "OINODbBunSqlite", "initializeApiDatamodel", "Unsupported field definition skipped.", { field: field_str });
                     }
                 }
                 else {
@@ -298,7 +341,7 @@ class OINODbBunSqlite extends db_1.OINODb {
                     const field_length = parseInt(field_match[4]) || 0;
                     if (api.isFieldIncluded(field_name) == false) {
                         excluded_fields.push(field_name);
-                        db_1.OINOLog.info("@oino-ts/db-bunsqlite", "OINODbBunSqlite", "initializeApiDatamodel", "Field excluded in API parameters.", { field: field_name });
+                        common_1.OINOLog.info("@oino-ts/db-bunsqlite", "OINODbBunSqlite", "initializeApiDatamodel", "Field excluded in API parameters.", { field: field_name });
                     }
                     else {
                         if ((sql_type == "INTEGER") || (sql_type == "REAL") || (sql_type == "DOUBLE") || (sql_type == "NUMERIC") || (sql_type == "DECIMAL")) {
@@ -322,14 +365,14 @@ class OINODbBunSqlite extends db_1.OINODb {
                             api.datamodel.addField(new db_1.OINOBooleanDataField(this, field_name, sql_type, field_params));
                         }
                         else {
-                            db_1.OINOLog.info("@oino-ts/db-bunsqlite", "OINODbBunSqlite", "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-bunsqlite", "OINODbBunSqlite", "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));
                         }
                     }
                 }
             }
             ;
-            db_1.OINOLog.info("@oino-ts/db-bunsqlite", "OINODbBunSqlite", "initializeApiDatamodel", "\n" + api.datamodel.printDebug("\n"));
+            common_1.OINOLog.info("@oino-ts/db-bunsqlite", "OINODbBunSqlite", "initializeApiDatamodel", "\n" + api.datamodel.printDebug("\n"));
             return Promise.resolve();
         }
     }

package/dist/esm/OINODbBunSqlite.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, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINO_ERROR_PREFIX, OINODbMemoryDataSet, OINOBenchmark, OINOBlobDataField, OINODatetimeDataField, OINOStr, OINOLog, OINOResult, OINODB_EMPTY_ROWS } from "@oino-ts/db";
+import { OINO_ERROR_PREFIX, OINOBenchmark, OINOStr, OINOLog, OINOResult } from "@oino-ts/common";
+import { OINODb, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINODbMemoryDataSet, OINOBlobDataField, OINODatetimeDataField, OINODB_EMPTY_ROWS } from "@oino-ts/db";
 import { Database as BunSqliteDb } from "bun:sqlite";
 /**
  * Implmentation of OINODbDataSet for BunSqlite.
@@ -150,6 +151,9 @@ export class OINODbBunSqlite extends OINODb {
     async connect() {
         OINOBenchmark.startMetric("OINODb", "connect");
         let result = new OINOResult();
+        if (this.isConnected) {
+            return result;
+        }
         const filepath = this._params.url.substring(7);
         try {
             this._db = BunSqliteDb.open(filepath, { create: true, readonly: false, readwrite: true });
@@ -167,11 +171,15 @@ export class OINODbBunSqlite extends OINODb {
      *
      */
     async validate() {
+        if (!this.isConnected) {
+            return new OINOResult().setError(400, "Database not connected!", "OINODbBunSqlite.validate");
+        }
         OINOBenchmark.startMetric("OINODb", "validate");
         let result = new OINOResult();
         try {
+            this.isValidated = false;
             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!", "OINODbBunSqlite.validate");
             }
@@ -186,28 +194,67 @@ export class OINODbBunSqlite extends OINODb {
             }
         }
         catch (e) {
-            result.setError(500, OINO_ERROR_PREFIX + " (validate): OINODbBunSqlite.validate exception in _db.query: " + e.message, "OINODbBunSqlite.validate");
+            result.setError(500, OINO_ERROR_PREFIX + " (OINODbBunSqlite.validate): Exception in db query: " + e.message, "OINODbBunSqlite.validate");
         }
         OINOBenchmark.endMetric("OINODb", "validate");
         return result;
     }
     /**
-     * Execute a select operation.
-     *
-     * @param sql SQL statement.
+     * Connect to database.
      *
      */
-    async sqlSelect(sql) {
-        OINOBenchmark.startMetric("OINODb", "sqlSelect");
+    async disconnect() {
+        this.isConnected = false;
+        this.isValidated = false;
+    }
+    async _query(sql) {
         let result;
         try {
-            result = new OINOBunSqliteDataset(this._db?.query(sql).values(), []);
+            const sql_res = this._db?.query(sql).values();
+            if (sql_res) {
+                // console.log("OINODbBunSqlite._query: res", sql_res)
+                result = new OINOBunSqliteDataset(sql_res, []);
+            }
+            else {
+                result = new OINOBunSqliteDataset(OINODB_EMPTY_ROWS, []);
+            }
         }
         catch (e) {
-            result = new OINOBunSqliteDataset(OINODB_EMPTY_ROWS, ["OINODbBunSqlite.sqlSelect exception in _db.query: " + e.message]);
+            result = new OINOBunSqliteDataset(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + " (OINODbBunSqlite._query): Exception in db query: " + e.message, "OINODbBunSqlite._query");
+        }
+        return result;
+    }
+    async _exec(sql) {
+        let result;
+        try {
+            const sql_res = this._db?.query(sql).values();
+            if (sql_res) {
+                // console.log("OINODbBunSqlite._exec: res", sql_res)
+                result = new OINOBunSqliteDataset(sql_res, []);
+            }
+            else {
+                result = new OINOBunSqliteDataset(OINODB_EMPTY_ROWS, []);
+            }
         }
+        catch (e) {
+            result = new OINOBunSqliteDataset(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db exec: " + e.message, "OINODbBunSqlite._exec");
+        }
+        return result;
+    }
+    /**
+     * Execute a select operation.
+     *
+     * @param sql SQL statement.
+     *
+     */
+    async sqlSelect(sql) {
+        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 Promise.resolve(result);
+        return result;
     }
     /**
      * Execute other sql operations.
@@ -216,17 +263,13 @@ export class OINODbBunSqlite extends OINODb {
      *
      */
     async sqlExec(sql) {
-        OINOBenchmark.startMetric("OINODb", "sqlExec");
-        let result;
-        try {
-            this._db?.exec(sql);
-            result = new OINOBunSqliteDataset(OINODB_EMPTY_ROWS, []);
-        }
-        catch (e) {
-            result = new OINOBunSqliteDataset(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + "(sqlExec): exception in _db.exec [" + e.message + "]"]);
+        if (!this.isValidated) {
+            return new OINOBunSqliteDataset(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (OINODbBunSqlite.sqlExec): Database connection not validated!"]);
         }
+        OINOBenchmark.startMetric("OINODb", "sqlExec");
+        let result = await this._exec(sql);
         OINOBenchmark.endMetric("OINODb", "sqlExec");
-        return Promise.resolve(result);
+        return result;
     }
     _getSchemaSql(dbName, tableName) {
         const sql = "SELECT sql from sqlite_schema WHERE name='" + tableName + "'";
@@ -245,7 +288,7 @@ export class OINODbBunSqlite extends OINODb {
      */
     async initializeApiDatamodel(api) {
         const schema_sql = this._getSchemaSql(this._params.database, api.params.tableName);
-        const res = await this.sqlSelect(schema_sql);
+        const res = await this._query(schema_sql);
         const sql_desc = (res?.getRow()[0]);
         const excluded_fields = [];
         let table_matches = OINODbBunSqlite._tableDescriptionRegex.exec(sql_desc);

package/dist/types/OINODbBunSqlite.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 BunSqlite-database.
  *
@@ -64,6 +65,13 @@ export declare class OINODbBunSqlite extends OINODb {
      *
      */
     validate(): Promise<OINOResult>;
+    /**
+     * Connect to database.
+     *
+     */
+    disconnect(): Promise<void>;
+    private _query;
+    private _exec;
     /**
      * Execute a select operation.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db-bunsqlite",
-  "version": "0.18.1",
+  "version": "0.20.0",
   "description": "OINO TS package for using Bun Sqlite databases.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -20,7 +20,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"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/OINODbBunSqlite.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, OINODbMemoryDataSet, OINODataCell, OINOBenchmark, OINOBlobDataField, OINODatetimeDataField, OINOStr, OINOLog, OINOResult, OINODB_EMPTY_ROWS } from "@oino-ts/db";
+import { OINO_ERROR_PREFIX, OINOBenchmark, OINOStr, OINOLog, OINOResult } from "@oino-ts/common";
+import { OINODb, OINODbParams, OINODbDataSet, OINODbApi, OINOBooleanDataField, OINONumberDataField, OINOStringDataField, OINODbDataFieldParams, OINODbMemoryDataSet, OINODataCell, OINOBlobDataField, OINODatetimeDataField, OINODB_EMPTY_ROWS } from "@oino-ts/db";
 
 import { Database as BunSqliteDb } from "bun:sqlite";
 
@@ -162,6 +163,9 @@ export class OINODbBunSqlite extends OINODb {
     async connect(): Promise<OINOResult> {
         OINOBenchmark.startMetric("OINODb", "connect")
         let result:OINOResult = new OINOResult()
+        if (this.isConnected) {
+            return result
+        }
         const filepath:string = this._params.url.substring(7)
         try {
             this._db = BunSqliteDb.open(filepath, { create: true, readonly: false, readwrite: true })        
@@ -179,11 +183,15 @@ export class OINODbBunSqlite extends OINODb {
      *
      */
     async validate(): Promise<OINOResult> {
+        if (!this.isConnected) {
+            return new OINOResult().setError(400, "Database not connected!", "OINODbBunSqlite.validate")
+        }
         OINOBenchmark.startMetric("OINODb", "validate")
         let result:OINOResult = new OINOResult()
         try {
+            this.isValidated = false
             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!", "OINODbBunSqlite.validate")
 
@@ -197,29 +205,69 @@ export class OINODbBunSqlite extends OINODb {
                 this.isValidated = true
             }
         } catch (e:any) {
-            result.setError(500, OINO_ERROR_PREFIX + " (validate): OINODbBunSqlite.validate exception in _db.query: " + e.message, "OINODbBunSqlite.validate")
+            result.setError(500, OINO_ERROR_PREFIX + " (OINODbBunSqlite.validate): Exception in db query: " + e.message, "OINODbBunSqlite.validate")
         }
         OINOBenchmark.endMetric("OINODb", "validate")
         return result
     }
 
     /**
-     * Execute a select operation.
-     * 
-     * @param sql SQL statement.
+     * Connect to database.
      *
      */
-    async sqlSelect(sql:string): Promise<OINODbDataSet> {
-        OINOBenchmark.startMetric("OINODb", "sqlSelect")
+    async disconnect(): Promise<void> {
+        this.isConnected = false
+        this.isValidated = false
+    }
+
+
+    private async _query(sql:string): Promise<OINODbDataSet> {
+        let result:OINODbDataSet
+        try {
+            const sql_res = this._db?.query(sql).values()
+            if (sql_res) {
+                // console.log("OINODbBunSqlite._query: res", sql_res)
+                result = new OINOBunSqliteDataset(sql_res, [])
+            } else {
+                result = new OINOBunSqliteDataset(OINODB_EMPTY_ROWS, [])
+            }            
+
+        } catch (e:any) {
+            result = new OINOBunSqliteDataset(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + " (OINODbBunSqlite._query): Exception in db query: " + e.message, "OINODbBunSqlite._query") as OINOBunSqliteDataset
+        }
+        return result
+    }
+    private async _exec(sql:string): Promise<OINODbDataSet> {
         let result:OINODbDataSet
         try {
-            result = new OINOBunSqliteDataset(this._db?.query(sql).values(), [])
+            const sql_res = this._db?.query(sql).values()
+            if (sql_res) {
+                // console.log("OINODbBunSqlite._exec: res", sql_res)
+                result = new OINOBunSqliteDataset(sql_res, [])
+            } else {
+                result = new OINOBunSqliteDataset(OINODB_EMPTY_ROWS, [])
+            }            
 
         } catch (e:any) {
-            result = new OINOBunSqliteDataset(OINODB_EMPTY_ROWS, ["OINODbBunSqlite.sqlSelect exception in _db.query: " + e.message])
+            result = new OINOBunSqliteDataset(OINODB_EMPTY_ROWS, []).setError(500, OINO_ERROR_PREFIX + ": Exception in db exec: " + e.message, "OINODbBunSqlite._exec") as OINOBunSqliteDataset
         }
+        return result
+    }
+
+    /**
+     * Execute a select operation.
+     * 
+     * @param sql SQL statement.
+     *
+     */
+    async sqlSelect(sql:string): Promise<OINODbDataSet> {
+        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 Promise.resolve(result)
+        return result
     }
 
     /**
@@ -229,17 +277,13 @@ export class OINODbBunSqlite extends OINODb {
      *
      */
     async sqlExec(sql:string): Promise<OINODbDataSet> {
-        OINOBenchmark.startMetric("OINODb", "sqlExec")
-        let result:OINODbDataSet
-        try {
-            this._db?.exec(sql)
-            result = new OINOBunSqliteDataset(OINODB_EMPTY_ROWS, [])
-
-        } catch (e:any) {
-            result = new OINOBunSqliteDataset(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + "(sqlExec): exception in _db.exec [" + e.message + "]"])
+        if (!this.isValidated) {
+            return new OINOBunSqliteDataset(OINODB_EMPTY_ROWS, [OINO_ERROR_PREFIX + " (OINODbBunSqlite.sqlExec): Database connection not validated!"])
         }
+        OINOBenchmark.startMetric("OINODb", "sqlExec")
+        let result:OINODbDataSet = await this._exec(sql)
         OINOBenchmark.endMetric("OINODb", "sqlExec")
-        return Promise.resolve(result)
+        return result
     }
     
     private _getSchemaSql(dbName:string, tableName:string):string {
@@ -261,7 +305,7 @@ export class OINODbBunSqlite extends OINODb {
      */
     async initializeApiDatamodel(api:OINODbApi): Promise<void> {
         const schema_sql:string = this._getSchemaSql(this._params.database, api.params.tableName)
-        const res:OINODbDataSet|null = await this.sqlSelect(schema_sql)
+        const res:OINODbDataSet|null = await this._query(schema_sql)
         const sql_desc:string = (res?.getRow()[0]) as string
         const excluded_fields:string[] = []
         let table_matches = OINODbBunSqlite._tableDescriptionRegex.exec(sql_desc)