@oino-ts/db 0.5.1 → 0.6.0

package/dist/cjs/OINODbApi.js

@@ -121,6 +121,7 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
             for (let i = 0; i < datamodel.fields.length; i++) {
                 const f = datamodel.fields[i];
                 let value;
+                // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {field:f.name, row_value:row[i], value_type:typeof row[i]})
                 if ((this._locale != null) && (f instanceof index_js_1.OINODatetimeDataField)) {
                     value = f.serializeCellWithLocale(row[i], this._locale);
                 }

package/dist/cjs/OINODbFactory.js

@@ -39,6 +39,10 @@ class OINODbFactory {
             throw new Error("Unsupported database type: " + params.type);
         }
         await result.connect();
+        const validate_res = await result.validate();
+        if (validate_res.success == false) {
+            throw new Error("Database connection validation failed: " + validate_res.statusMessage);
+        }
         return result;
     }
     /**

package/dist/cjs/OINODbSqlParams.js

@@ -412,7 +412,7 @@ class OINODbSqlAggregate {
                 result += f.printSqlColumnName() + ",";
             }
         }
-        index_js_1.OINOLog.debug("OINODbSqlAggregate.toSql", { result: result });
+        // OINOLog.debug("OINODbSqlAggregate.toSql", {result:result})
         return result.substring(0, result.length - 1);
     }
     /**

package/dist/esm/OINODbApi.js

@@ -117,6 +117,7 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
             for (let i = 0; i < datamodel.fields.length; i++) {
                 const f = datamodel.fields[i];
                 let value;
+                // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {field:f.name, row_value:row[i], value_type:typeof row[i]})
                 if ((this._locale != null) && (f instanceof OINODatetimeDataField)) {
                     value = f.serializeCellWithLocale(row[i], this._locale);
                 }

package/dist/esm/OINODbFactory.js

@@ -36,6 +36,10 @@ export class OINODbFactory {
             throw new Error("Unsupported database type: " + params.type);
         }
         await result.connect();
+        const validate_res = await result.validate();
+        if (validate_res.success == false) {
+            throw new Error("Database connection validation failed: " + validate_res.statusMessage);
+        }
         return result;
     }
     /**

package/dist/esm/OINODbSqlParams.js

@@ -406,7 +406,7 @@ export class OINODbSqlAggregate {
                 result += f.printSqlColumnName() + ",";
             }
         }
-        OINOLog.debug("OINODbSqlAggregate.toSql", { result: result });
+        // OINOLog.debug("OINODbSqlAggregate.toSql", {result:result})
         return result.substring(0, result.length - 1);
     }
     /**

package/dist/types/OINODb.d.ts

@@ -1,4 +1,4 @@
-import { OINODbParams, OINODbApi, OINODataCell, OINODataRow } from "./index.js";
+import { OINODbParams, OINODbApi, OINODataCell, OINODataRow, OINOResult } from "./index.js";
 /**
  * Base class for database abstraction, implementing methods for connecting, making queries and parsing/formatting data
  * between SQL and serialization formats.
@@ -18,6 +18,11 @@ export declare abstract class OINODb {
      *
      */
     abstract connect(): Promise<boolean>;
+    /**
+     * Validate connection to database is working.
+     *
+     */
+    abstract validate(): Promise<OINOResult>;
     /**
      * Print a table name using database specific SQL escaping.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "OINO TS library package for publishing an SQL database tables as a REST API.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -19,12 +19,12 @@
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "dependencies": {
-    "@oino-ts/common": "0.5.1"
+    "@oino-ts/common": "0.6.0"
   },
   "devDependencies": {
     "@types/node": "^20.14.10",
     "@types/bun": "^1.1.14",
-    "@oino-ts/types": "0.5.1",
+    "@oino-ts/types": "0.6.0",
     "typedoc": "^0.25.13"
   },
   "files": [

package/src/OINODb.ts

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { OINODbParams, OINODbApi, OINODataCell, OINO_ERROR_PREFIX, OINODataRow, OINODB_EMPTY_ROW } from "./index.js"
+import { OINODbParams, OINODbApi, OINODataCell, OINO_ERROR_PREFIX, OINODataRow, OINODB_EMPTY_ROW, OINOResult } from "./index.js"
 
 /**
  * Base class for database abstraction, implementing methods for connecting, making queries and parsing/formatting data 
@@ -33,6 +33,12 @@ export abstract class OINODb {
      */
     abstract connect(): Promise<boolean>
     
+    /**
+     * Validate connection to database is working. 
+     *
+     */
+    abstract validate(): Promise<OINOResult>
+    
     /**
      * Print a table name using database specific SQL escaping.
      * 

package/src/OINODbApi.test.ts

@@ -12,7 +12,7 @@ import { OINODbBunSqlite } from "@oino-ts/db-bunsqlite"
 import { OINODbPostgresql } from "@oino-ts/db-postgresql"
 import { OINODbMariadb } from "@oino-ts/db-mariadb"
 import { OINODbMsSql } from "@oino-ts/db-mssql"
-import { OINODbSqlAggregate } from "./OINODbSqlParams.js";
+import { OINODbSqlAggregate, OINODbSqlSelect } from "./OINODbSqlParams.js";
 
 const OINODB_POSTGRESQL_TOKEN = process.env.OINODB_POSTGRESQL_TOKEN || console.error("OINODB_POSTGRESQL_TOKEN not set") || ""
 const OINODB_MARIADB_TOKEN = process.env.OINODB_MARIADB_TOKEN || console.error("OINODB_MARIADB_TOKEN not set") || ""
@@ -67,7 +67,7 @@ const api_tests:OINOTestParams[] = [
         name: "API 4",
         apiParams: { apiName: "OrderDetails", tableName: "OrderDetails" },
         requestParams: {
-            sqlParams: { aggregate: OINODbSqlAggregate.parse("count(ProductID),avg(UnitPrice),sum(Quantity),max(Discount)") }
+            sqlParams: { aggregate: OINODbSqlAggregate.parse("count(OrderID),count(ProductID),avg(UnitPrice),sum(Quantity)"), select: OINODbSqlSelect.parse("OrderID,ProductID,UnitPrice,Quantity,Discount"), order: OINODbSqlOrder.parse("Discount asc") }
         },
         postRow: [10249,77,12.34,56,0],
         putRow: [10249,77,23.45,67,0]

package/src/OINODbApi.ts

@@ -124,6 +124,7 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
             for (let i=0; i<datamodel.fields.length; i++) {
                 const f:OINODbDataField = datamodel.fields[i]
                 let value:string|null|undefined
+                // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {field:f.name, row_value:row[i], value_type:typeof row[i]})
                 if ((this._locale != null) && (f instanceof OINODatetimeDataField)) {
                     value = f.serializeCellWithLocale(row[i], this._locale)
                 } else {

package/src/OINODbFactory.ts

@@ -40,6 +40,10 @@ export class OINODbFactory {
             throw new Error("Unsupported database type: " + params.type)
         }
         await result.connect()
+        const validate_res = await result.validate()
+        if (validate_res.success == false) {
+            throw new Error("Database connection validation failed: " + validate_res.statusMessage)
+        }
         return result
     }
 

package/src/OINODbSqlParams.ts

@@ -411,7 +411,7 @@ export class OINODbSqlAggregate {
                 result += f.printSqlColumnName() + ","
             }
         }
-        OINOLog.debug("OINODbSqlAggregate.toSql", {result:result})
+        // OINOLog.debug("OINODbSqlAggregate.toSql", {result:result})
         return result.substring(0, result.length-1)
     }