@oino-ts/db-bunsqlite 0.19.0 → 0.20.1

package/dist/cjs/OINODbBunSqlite.js

@@ -154,6 +154,9 @@ class OINODbBunSqlite extends db_1.OINODb {
     async connect() {
         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 });
@@ -171,11 +174,15 @@ class OINODbBunSqlite extends db_1.OINODb {
      *
      */
     async validate() {
+        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");
             }
@@ -190,28 +197,67 @@ class OINODbBunSqlite extends db_1.OINODb {
             }
         }
         catch (e) {
-            result.setError(500, common_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");
         }
         common_1.OINOBenchmark.endMetric("OINODb", "validate");
         return result;
     }
     /**
-     * Execute a select operation.
-     *
-     * @param sql SQL statement.
+     * Connect to database.
      *
      */
-    async sqlSelect(sql) {
-        common_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");
+        }
+        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 Promise.resolve(result);
+        return result;
     }
     /**
      * Execute other sql operations.
@@ -220,17 +266,13 @@ class OINODbBunSqlite extends db_1.OINODb {
      *
      */
     async sqlExec(sql) {
-        common_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, [common_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!"]);
         }
+        common_1.OINOBenchmark.startMetric("OINODb", "sqlExec");
+        let result = await this._exec(sql);
         common_1.OINOBenchmark.endMetric("OINODb", "sqlExec");
-        return Promise.resolve(result);
+        return result;
     }
     _getSchemaSql(dbName, tableName) {
         const sql = "SELECT sql from sqlite_schema WHERE name='" + tableName + "'";
@@ -249,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);

package/dist/esm/OINODbBunSqlite.js

@@ -151,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 });
@@ -168,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");
             }
@@ -187,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.
@@ -217,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 + "'";
@@ -246,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

@@ -65,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.19.0",
+  "version": "0.20.1",
   "description": "OINO TS package for using Bun Sqlite databases.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -20,8 +20,8 @@
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "dependencies": {
-    "@oino-ts/common": "^0.19.0",
-    "@oino-ts/db": "^0.19.0"
+    "@oino-ts/common": "^0.20.1",
+    "@oino-ts/db": "^0.20.1"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/OINODbBunSqlite.ts

@@ -163,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 })        
@@ -180,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")
 
@@ -198,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
     }
 
     /**
@@ -230,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 {
@@ -262,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)