@oino-ts/db 0.0.13 → 0.0.15

package/dist/cjs/OINODbApi.js

@@ -62,23 +62,29 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
      * Creates HTML Response from API modelset.
      *
      * @param modelset OINO API dataset
+     * @param overrideValues values to override in the data
      *
      */
-    renderFromDbData(modelset) {
+    renderFromDbData(modelset, overrideValues) {
+        index_js_1.OINOBenchmark.start("OINOHtmlTemplate", "renderFromDbData");
         let html = "";
         const dataset = modelset.dataset;
         const datamodel = modelset.datamodel;
         const api = modelset.datamodel.api;
         const modified_index = datamodel.findFieldIndexByName(api.params.cacheModifiedField || "");
         let last_modified = this.modified;
+        // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
         while (!dataset.isEof()) {
             const row = dataset.getRow();
             if (modified_index >= 0) {
                 last_modified = Math.max(last_modified, new Date(row[modified_index]).getTime());
+                // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
             }
             let row_id_seed = datamodel.getRowPrimarykeyValues(row).join(' ');
             let primary_key_values = [];
-            let html_row = this.template.replaceAll('###' + index_js_1.OINODbConfig.OINODB_ID_FIELD + '###', '###createHtmlFromData_temporary_oinoid###');
+            this.clearVariables();
+            this.setVariableFromValue(index_js_1.OINODbConfig.OINODB_ID_FIELD, "");
+            // let html_row:string = this.template.replaceAll('###' + OINODbConfig.OINODB_ID_FIELD + '###', '###createHtmlFromData_temporary_oinoid###')
             for (let i = 0; i < datamodel.fields.length; i++) {
                 const f = datamodel.fields[i];
                 let value = f.serializeCell(row[i]);
@@ -89,14 +95,18 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
                     primary_key_values.push(value || "");
                 }
                 // OINOLog.debug("renderFromDbData replace field value", {field:f.name, value:value }) 
-                html_row = html_row.replaceAll('###' + f.name + '###', index_js_1.OINOStr.encode(value, index_js_1.OINOContentType.html));
+                this.setVariableFromValue(f.name, value || "");
             }
-            html_row = html_row.replaceAll('###createHtmlFromData_temporary_oinoid###', index_js_1.OINOStr.encode(index_js_1.OINODbConfig.printOINOId(primary_key_values), index_js_1.OINOContentType.html));
-            html += html_row + "\r\n";
+            this.setVariableFromProperties(overrideValues);
+            this.setVariableFromValue(index_js_1.OINODbConfig.OINODB_ID_FIELD, index_js_1.OINODbConfig.printOINOId(primary_key_values));
+            // html_row = html_row.replaceAll('###createHtmlFromData_temporary_oinoid###', OINOStr.encode(OINODbConfig.printOINOId(primary_key_values), OINOContentType.html)) 
+            html += this._renderHtml() + "\r\n";
             dataset.next();
         }
-        const result = new index_js_1.OINOHttpResult(html);
-        result.lastModified = last_modified;
+        // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
+        this.modified = last_modified;
+        const result = this._createHttpResult(html, false);
+        index_js_1.OINOBenchmark.end("OINOHtmlTemplate", "renderFromDbData");
         return result;
     }
 }
@@ -131,7 +141,7 @@ class OINODbApi {
         this.params = params;
         this.datamodel = new index_js_1.OINODbDataModel(this);
         if (this.params.hashidKey) {
-            this.hashid = new hashid_1.OINOHashid(this.params.hashidKey, this.db.name, this.params.hashidLength, this.params.hashidRandomIds);
+            this.hashid = new hashid_1.OINOHashid(this.params.hashidKey, this.db.name, this.params.hashidLength, this.params.hashidStaticIds);
         }
         else {
             this.hashid = null;
@@ -171,7 +181,6 @@ class OINODbApi {
         //logDebug("OINODbApi.validateHttpValues", {result:result})
     }
     async _doGet(result, id, params) {
-        index_js_1.OINOBenchmark.start("doGet");
         const sql = this.datamodel.printSqlSelect(id, params.sqlParams || {});
         // OINOLog.debug("OINODbApi.doGet sql", {sql:sql})
         try {
@@ -189,10 +198,8 @@ class OINODbApi {
             result.setError(500, "Unhandled exception in doGet: " + e.message, "DoGet");
             result.addDebug("OINO GET SQL [" + sql + "]", "DoGet");
         }
-        index_js_1.OINOBenchmark.end("doGet");
     }
     async _doPost(result, rows) {
-        index_js_1.OINOBenchmark.start("doPost");
         let sql = "";
         try {
             let i = 0;
@@ -223,10 +230,8 @@ class OINODbApi {
             result.setError(500, "Unhandled exception in doPost: " + e.message, "DoPost");
             result.addDebug("OINO POST SQL [" + sql + "]", "DoPost");
         }
-        index_js_1.OINOBenchmark.end("doPost");
     }
     async _doPut(result, id, row) {
-        index_js_1.OINOBenchmark.start("doPut");
         let sql = "";
         try {
             this._validateRowValues(result, row, false);
@@ -246,10 +251,8 @@ class OINODbApi {
             result.setError(500, "Unhandled exception: " + e.message, "DoPut");
             result.addDebug("OINO POST SQL [" + sql + "]", "DoPut");
         }
-        index_js_1.OINOBenchmark.end("doPut");
     }
     async _doDelete(result, id) {
-        index_js_1.OINOBenchmark.start("doDelete");
         let sql = "";
         try {
             sql = this.datamodel.printSqlDelete(id);
@@ -266,7 +269,6 @@ class OINODbApi {
             result.setError(500, "Unhandled exception: " + e.message, "DoDelete");
             result.addDebug("OINO DELETE SQL [" + sql + "]", "DoDelete");
         }
-        index_js_1.OINOBenchmark.end("doDelete");
     }
     /**
      * Method for handlind a HTTP REST request with GET, POST, PUT, DELETE corresponding to
@@ -279,7 +281,7 @@ class OINODbApi {
      *
      */
     async doRequest(method, id, body, params = API_EMPTY_PARAMS) {
-        index_js_1.OINOBenchmark.start("doRequest");
+        index_js_1.OINOBenchmark.start("OINODbApi", "doRequest");
         // OINOLog.debug("OINODbApi.doRequest enter", {method:method, id:id, body:body, params:params})
         let result = new OINODbApiResult(params);
         let rows = [];
@@ -347,7 +349,7 @@ class OINODbApi {
         else {
             result.setError(405, "Unsupported HTTP method '" + method + "'", "DoRequest");
         }
-        index_js_1.OINOBenchmark.end("doRequest");
+        index_js_1.OINOBenchmark.end("OINODbApi", "doRequest", method);
         return result;
     }
 }

package/dist/cjs/OINODbDataField.js

@@ -238,7 +238,7 @@ class OINONumberDataField extends OINODbDataField {
         if (value === undefined) {
             return undefined;
         }
-        else if ((value == "") || (value == null)) {
+        else if ((value === "") || (value === null)) {
             return null;
         }
         else {

package/dist/cjs/OINODbDataModel.js

@@ -225,10 +225,10 @@ class OINODbDataModel {
         const order_sql = params.order?.toSql(this) || "";
         const limit_sql = params.limit?.toSql(this) || "";
         // OINOLog.debug("OINODbDataModel.printSqlSelect", {select_sql:result, filter_sql:filter_sql, order_sql:order_sql})
-        if ((id != "") && (filter_sql != "")) {
+        if ((id != null) && (id != "") && (filter_sql != "")) {
             result += "\nWHERE " + this._printSqlPrimaryKeyCondition(id) + " AND " + filter_sql;
         }
-        else if (id != "") {
+        else if ((id != null) && (id != "")) {
             result += "\nWHERE " + this._printSqlPrimaryKeyCondition(id);
         }
         else if (filter_sql != "") {

package/dist/cjs/OINODbFactory.js

@@ -6,7 +6,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OINODbFactory = void 0;
-const OINOResult_js_1 = require("../../types/src/OINOResult.js");
 const index_js_1 = require("./index.js");
 /**
  * Static factory class for easily creating things based on data
@@ -143,7 +142,7 @@ class OINODbFactory {
             html += html_row + "\r\n";
             dataset.next();
         }
-        const result = new OINOResult_js_1.OINOHttpResult(html);
+        const result = new index_js_1.OINOHttpResult(html);
         return result;
     }
     /**
@@ -180,7 +179,7 @@ class OINODbFactory {
             html = html.replaceAll('###messages###', "<ul>" + messages + "</ul>");
         }
         html = html.replace(/###[^#]*###/g, "");
-        const http_result = new OINOResult_js_1.OINOHttpResult(html);
+        const http_result = new index_js_1.OINOHttpResult(html);
         return http_result;
     }
     static _findCsvLineEnd(csvData, start) {

package/dist/cjs/OINODbModelSet.js

@@ -250,15 +250,19 @@ class OINODbModelSet {
      * field not found or value does not exist.
      *
      * @param fieldName name of the field
+     * @param serialize serialize the value
      *
      */
-    getValueByFieldName(fieldName) {
+    getValueByFieldName(fieldName, serialize = false) {
         let result = undefined;
         if (!this.dataset.isEof()) {
             const current_row = this.dataset.getRow();
             const field_index = this.datamodel.findFieldIndexByName(fieldName);
             if (field_index >= 0) {
                 result = current_row[field_index];
+                if (serialize) {
+                    result = this.datamodel.fields[field_index].serializeCell(result);
+                }
             }
         }
         return result;

package/dist/esm/OINODbApi.js

@@ -3,7 +3,7 @@
  * 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 { OINODbDataModel, OINOStringDataField, OINO_ERROR_PREFIX, OINODbModelSet, OINOBenchmark, OINODbFactory, OINOLog, OINODbConfig, OINOHttpResult, OINOHtmlTemplate, OINONumberDataField, OINOContentType, OINOStr } from "./index.js";
+import { OINODbDataModel, OINOStringDataField, OINO_ERROR_PREFIX, OINODbModelSet, OINOBenchmark, OINODbFactory, OINOLog, OINODbConfig, OINOHtmlTemplate, OINONumberDataField } from "./index.js";
 import { OINOResult } from "@oino-ts/types";
 import { OINOHashid } from "@oino-ts/hashid";
 const API_EMPTY_PARAMS = { sqlParams: {} };
@@ -58,23 +58,29 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
      * Creates HTML Response from API modelset.
      *
      * @param modelset OINO API dataset
+     * @param overrideValues values to override in the data
      *
      */
-    renderFromDbData(modelset) {
+    renderFromDbData(modelset, overrideValues) {
+        OINOBenchmark.start("OINOHtmlTemplate", "renderFromDbData");
         let html = "";
         const dataset = modelset.dataset;
         const datamodel = modelset.datamodel;
         const api = modelset.datamodel.api;
         const modified_index = datamodel.findFieldIndexByName(api.params.cacheModifiedField || "");
         let last_modified = this.modified;
+        // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
         while (!dataset.isEof()) {
             const row = dataset.getRow();
             if (modified_index >= 0) {
                 last_modified = Math.max(last_modified, new Date(row[modified_index]).getTime());
+                // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
             }
             let row_id_seed = datamodel.getRowPrimarykeyValues(row).join(' ');
             let primary_key_values = [];
-            let html_row = this.template.replaceAll('###' + OINODbConfig.OINODB_ID_FIELD + '###', '###createHtmlFromData_temporary_oinoid###');
+            this.clearVariables();
+            this.setVariableFromValue(OINODbConfig.OINODB_ID_FIELD, "");
+            // let html_row:string = this.template.replaceAll('###' + OINODbConfig.OINODB_ID_FIELD + '###', '###createHtmlFromData_temporary_oinoid###')
             for (let i = 0; i < datamodel.fields.length; i++) {
                 const f = datamodel.fields[i];
                 let value = f.serializeCell(row[i]);
@@ -85,14 +91,18 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
                     primary_key_values.push(value || "");
                 }
                 // OINOLog.debug("renderFromDbData replace field value", {field:f.name, value:value }) 
-                html_row = html_row.replaceAll('###' + f.name + '###', OINOStr.encode(value, OINOContentType.html));
+                this.setVariableFromValue(f.name, value || "");
             }
-            html_row = html_row.replaceAll('###createHtmlFromData_temporary_oinoid###', OINOStr.encode(OINODbConfig.printOINOId(primary_key_values), OINOContentType.html));
-            html += html_row + "\r\n";
+            this.setVariableFromProperties(overrideValues);
+            this.setVariableFromValue(OINODbConfig.OINODB_ID_FIELD, OINODbConfig.printOINOId(primary_key_values));
+            // html_row = html_row.replaceAll('###createHtmlFromData_temporary_oinoid###', OINOStr.encode(OINODbConfig.printOINOId(primary_key_values), OINOContentType.html)) 
+            html += this._renderHtml() + "\r\n";
             dataset.next();
         }
-        const result = new OINOHttpResult(html);
-        result.lastModified = last_modified;
+        // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
+        this.modified = last_modified;
+        const result = this._createHttpResult(html, false);
+        OINOBenchmark.end("OINOHtmlTemplate", "renderFromDbData");
         return result;
     }
 }
@@ -126,7 +136,7 @@ export class OINODbApi {
         this.params = params;
         this.datamodel = new OINODbDataModel(this);
         if (this.params.hashidKey) {
-            this.hashid = new OINOHashid(this.params.hashidKey, this.db.name, this.params.hashidLength, this.params.hashidRandomIds);
+            this.hashid = new OINOHashid(this.params.hashidKey, this.db.name, this.params.hashidLength, this.params.hashidStaticIds);
         }
         else {
             this.hashid = null;
@@ -166,7 +176,6 @@ export class OINODbApi {
         //logDebug("OINODbApi.validateHttpValues", {result:result})
     }
     async _doGet(result, id, params) {
-        OINOBenchmark.start("doGet");
         const sql = this.datamodel.printSqlSelect(id, params.sqlParams || {});
         // OINOLog.debug("OINODbApi.doGet sql", {sql:sql})
         try {
@@ -184,10 +193,8 @@ export class OINODbApi {
             result.setError(500, "Unhandled exception in doGet: " + e.message, "DoGet");
             result.addDebug("OINO GET SQL [" + sql + "]", "DoGet");
         }
-        OINOBenchmark.end("doGet");
     }
     async _doPost(result, rows) {
-        OINOBenchmark.start("doPost");
         let sql = "";
         try {
             let i = 0;
@@ -218,10 +225,8 @@ export class OINODbApi {
             result.setError(500, "Unhandled exception in doPost: " + e.message, "DoPost");
             result.addDebug("OINO POST SQL [" + sql + "]", "DoPost");
         }
-        OINOBenchmark.end("doPost");
     }
     async _doPut(result, id, row) {
-        OINOBenchmark.start("doPut");
         let sql = "";
         try {
             this._validateRowValues(result, row, false);
@@ -241,10 +246,8 @@ export class OINODbApi {
             result.setError(500, "Unhandled exception: " + e.message, "DoPut");
             result.addDebug("OINO POST SQL [" + sql + "]", "DoPut");
         }
-        OINOBenchmark.end("doPut");
     }
     async _doDelete(result, id) {
-        OINOBenchmark.start("doDelete");
         let sql = "";
         try {
             sql = this.datamodel.printSqlDelete(id);
@@ -261,7 +264,6 @@ export class OINODbApi {
             result.setError(500, "Unhandled exception: " + e.message, "DoDelete");
             result.addDebug("OINO DELETE SQL [" + sql + "]", "DoDelete");
         }
-        OINOBenchmark.end("doDelete");
     }
     /**
      * Method for handlind a HTTP REST request with GET, POST, PUT, DELETE corresponding to
@@ -274,7 +276,7 @@ export class OINODbApi {
      *
      */
     async doRequest(method, id, body, params = API_EMPTY_PARAMS) {
-        OINOBenchmark.start("doRequest");
+        OINOBenchmark.start("OINODbApi", "doRequest");
         // OINOLog.debug("OINODbApi.doRequest enter", {method:method, id:id, body:body, params:params})
         let result = new OINODbApiResult(params);
         let rows = [];
@@ -342,7 +344,7 @@ export class OINODbApi {
         else {
             result.setError(405, "Unsupported HTTP method '" + method + "'", "DoRequest");
         }
-        OINOBenchmark.end("doRequest");
+        OINOBenchmark.end("OINODbApi", "doRequest", method);
         return result;
     }
 }

package/dist/esm/OINODbDataField.js

@@ -232,7 +232,7 @@ export class OINONumberDataField extends OINODbDataField {
         if (value === undefined) {
             return undefined;
         }
-        else if ((value == "") || (value == null)) {
+        else if ((value === "") || (value === null)) {
             return null;
         }
         else {

package/dist/esm/OINODbDataModel.js

@@ -222,10 +222,10 @@ export class OINODbDataModel {
         const order_sql = params.order?.toSql(this) || "";
         const limit_sql = params.limit?.toSql(this) || "";
         // OINOLog.debug("OINODbDataModel.printSqlSelect", {select_sql:result, filter_sql:filter_sql, order_sql:order_sql})
-        if ((id != "") && (filter_sql != "")) {
+        if ((id != null) && (id != "") && (filter_sql != "")) {
             result += "\nWHERE " + this._printSqlPrimaryKeyCondition(id) + " AND " + filter_sql;
         }
-        else if (id != "") {
+        else if ((id != null) && (id != "")) {
             result += "\nWHERE " + this._printSqlPrimaryKeyCondition(id);
         }
         else if (filter_sql != "") {

package/dist/esm/OINODbFactory.js

@@ -3,8 +3,7 @@
  * 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 { OINOHttpResult } from "../../types/src/OINOResult.js";
-import { OINODbApi, OINOContentType, OINODbSqlFilter, OINOStr, OINODbConfig, OINONumberDataField, OINODbSqlOrder, OINODbSqlLimit, OINO_ERROR_PREFIX, OINO_WARNING_PREFIX, OINO_INFO_PREFIX, OINO_DEBUG_PREFIX, OINOLog } from "./index.js";
+import { OINOHttpResult, OINODbApi, OINOContentType, OINODbSqlFilter, OINOStr, OINODbConfig, OINONumberDataField, OINODbSqlOrder, OINODbSqlLimit, OINO_ERROR_PREFIX, OINO_WARNING_PREFIX, OINO_INFO_PREFIX, OINO_DEBUG_PREFIX, OINOLog } from "./index.js";
 /**
  * Static factory class for easily creating things based on data
  *

package/dist/esm/OINODbModelSet.js

@@ -247,15 +247,19 @@ export class OINODbModelSet {
      * field not found or value does not exist.
      *
      * @param fieldName name of the field
+     * @param serialize serialize the value
      *
      */
-    getValueByFieldName(fieldName) {
+    getValueByFieldName(fieldName, serialize = false) {
         let result = undefined;
         if (!this.dataset.isEof()) {
             const current_row = this.dataset.getRow();
             const field_index = this.datamodel.findFieldIndexByName(fieldName);
             if (field_index >= 0) {
                 result = current_row[field_index];
+                if (serialize) {
+                    result = this.datamodel.fields[field_index].serializeCell(result);
+                }
             }
         }
         return result;

package/dist/types/OINODbApi.d.ts

@@ -25,7 +25,7 @@ export declare class OINODbApiResult extends OINOResult {
      * @param headers Headers to include in the response
      *
      */
-    getResponse(headers?: HeadersInit): Response;
+    getResponse(headers?: Record<string, string>): Response;
 }
 /**
  * Specialized HTML template that can render ´OINODbApiResult´.
@@ -36,9 +36,10 @@ export declare class OINODbHtmlTemplate extends OINOHtmlTemplate {
      * Creates HTML Response from API modelset.
      *
      * @param modelset OINO API dataset
+     * @param overrideValues values to override in the data
      *
      */
-    renderFromDbData(modelset: OINODbModelSet): OINOHttpResult;
+    renderFromDbData(modelset: OINODbModelSet, overrideValues?: any): OINOHttpResult;
 }
 /**
  * API class with method to process HTTP REST requests.

package/dist/types/OINODbFactory.d.ts

@@ -1,5 +1,4 @@
-import { OINOHttpResult } from "../../types/src/OINOResult.js";
-import { OINODbApi, OINODbApiParams, OINODbParams, OINODbDataModel, OINODb, OINODataRow, OINODbConstructor, OINODbApiRequestParams, OINODbModelSet, OINOResult } from "./index.js";
+import { OINOHttpResult, OINODbApi, OINODbApiParams, OINODbParams, OINODbDataModel, OINODb, OINODataRow, OINODbConstructor, OINODbApiRequestParams, OINODbModelSet, OINOResult } from "./index.js";
 /**
  * Static factory class for easily creating things based on data
  *

package/dist/types/OINODbModelSet.d.ts

@@ -44,7 +44,8 @@ export declare class OINODbModelSet {
      * field not found or value does not exist.
      *
      * @param fieldName name of the field
+     * @param serialize serialize the value
      *
      */
-    getValueByFieldName(fieldName: string): OINODataCell;
+    getValueByFieldName(fieldName: string, serialize?: boolean): OINODataCell;
 }

package/dist/types/index.d.ts

@@ -35,7 +35,7 @@ export type OINODbApiParams = {
     /** Set (minimum) length (12-32 chars) of the hashids */
     hashidLength?: number;
     /** Make hashids static per row/table */
-    hashidRandomIds?: boolean;
+    hashidStaticIds?: boolean;
     /** Name of field that has the modified field */
     cacheModifiedField?: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "OINO TS library package for publishing an SQL database tables as a REST API.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -20,7 +20,7 @@
   "types": "./dist/types/index.d.ts",
   "dependencies": {
     "@types/node": "^20.14.10",
-    "@oino-ts/types": "0.0.13"
+    "@oino-ts/types": "0.0.15"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/OINODbApi.test.ts

@@ -192,7 +192,7 @@ const apis:OINOTestApiParams[] = [
         putRow: [99, "Umeshu", 1, 1, undefined, 24.99, 3, 0, 20, 0]
     },
     {
-        apiParams: { tableName: "Employees", hashidKey: "12345678901234567890123456789012" },
+        apiParams: { tableName: "Employees", hashidKey: "12345678901234567890123456789012", hashidStaticIds:true },
         requestParams: {
             sqlParams: { filter: OINODbSqlFilter.parse("(TitleOfCourtesy)-eq(Ms.)"), order: OINODbSqlOrder.parse("LastName asc") }
         },

package/src/OINODbApi.ts

@@ -41,7 +41,7 @@ export class OINODbApiResult extends OINOResult {
      * @param headers Headers to include in the response
      * 
      */
-    getResponse(headers:HeadersInit = {}):Response {
+    getResponse(headers:Record<string, string> = {}):Response {
         let response:Response|null = null
         if (this.success && this.data) {
             response = new Response(this.data.writeString(this.params.responseType), {status:this.statusCode, statusText: this.statusMessage, headers: headers })
@@ -65,24 +65,30 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
      * Creates HTML Response from API modelset.
      *
      * @param modelset OINO API dataset
+     * @param overrideValues values to override in the data
      * 
      */
-    renderFromDbData(modelset:OINODbModelSet):OINOHttpResult {
+    renderFromDbData(modelset:OINODbModelSet, overrideValues?:any):OINOHttpResult {
+        OINOBenchmark.start("OINOHtmlTemplate", "renderFromDbData")
         let html:string = ""
         const dataset:OINODbDataSet|undefined = modelset.dataset
         const datamodel:OINODbDataModel = modelset.datamodel
         const api:OINODbApi = modelset.datamodel.api
         const modified_index = datamodel.findFieldIndexByName(api.params.cacheModifiedField || "")
         let last_modified:number = this.modified
+        // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
         
         while (!dataset.isEof()) {
             const row:OINODataRow = dataset.getRow()
             if (modified_index >= 0) {
                 last_modified = Math.max(last_modified, new Date(row[modified_index] as Date).getTime())
+                // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
             }
             let row_id_seed:string = datamodel.getRowPrimarykeyValues(row).join(' ')
             let primary_key_values:string[] = []
-            let html_row:string = this.template.replaceAll('###' + OINODbConfig.OINODB_ID_FIELD + '###', '###createHtmlFromData_temporary_oinoid###')
+            this.clearVariables()
+            this.setVariableFromValue(OINODbConfig.OINODB_ID_FIELD, "")
+            // let html_row:string = this.template.replaceAll('###' + OINODbConfig.OINODB_ID_FIELD + '###', '###createHtmlFromData_temporary_oinoid###')
             for (let i=0; i<datamodel.fields.length; i++) {
                 const f:OINODbDataField = datamodel.fields[i]
                 let value:string|null|undefined = f.serializeCell(row[i])
@@ -93,14 +99,18 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
                     primary_key_values.push(value || "")
                 }
                 // OINOLog.debug("renderFromDbData replace field value", {field:f.name, value:value }) 
-                html_row = html_row.replaceAll('###' + f.name + '###', OINOStr.encode(value, OINOContentType.html))
+                this.setVariableFromValue(f.name, value || "")
             }
-            html_row = html_row.replaceAll('###createHtmlFromData_temporary_oinoid###', OINOStr.encode(OINODbConfig.printOINOId(primary_key_values), OINOContentType.html)) 
-            html += html_row + "\r\n"
+            this.setVariableFromProperties(overrideValues)
+            this.setVariableFromValue(OINODbConfig.OINODB_ID_FIELD, OINODbConfig.printOINOId(primary_key_values))
+            // html_row = html_row.replaceAll('###createHtmlFromData_temporary_oinoid###', OINOStr.encode(OINODbConfig.printOINOId(primary_key_values), OINOContentType.html)) 
+            html += this._renderHtml() + "\r\n"
             dataset.next()
         }
-        const result:OINOHttpResult = new OINOHttpResult(html)
-        result.lastModified = last_modified
+        // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
+        this.modified = last_modified
+        const result:OINOHttpResult = this._createHttpResult(html, false)
+        OINOBenchmark.end("OINOHtmlTemplate", "renderFromDbData")
         return result
     }
 
@@ -141,7 +151,7 @@ export class OINODbApi {
         this.params = params
         this.datamodel = new OINODbDataModel(this)
         if (this.params.hashidKey) {
-            this.hashid = new OINOHashid(this.params.hashidKey, this.db.name, this.params.hashidLength, this.params.hashidRandomIds)
+            this.hashid = new OINOHashid(this.params.hashidKey, this.db.name, this.params.hashidLength, this.params.hashidStaticIds)
         } else {
             this.hashid = null
         }
@@ -182,7 +192,6 @@ export class OINODbApi {
     }
 
     private async _doGet(result:OINODbApiResult, id:string, params:OINODbApiRequestParams):Promise<void> {
-        OINOBenchmark.start("doGet")
         const sql:string = this.datamodel.printSqlSelect(id, params.sqlParams || {})
         // OINOLog.debug("OINODbApi.doGet sql", {sql:sql})
         try {
@@ -198,11 +207,9 @@ export class OINODbApi {
             result.setError(500, "Unhandled exception in doGet: " + e.message, "DoGet")
             result.addDebug("OINO GET SQL [" + sql + "]", "DoGet")
         }
-        OINOBenchmark.end("doGet")
     }
     
     private async _doPost(result:OINODbApiResult, rows:OINODataRow[]):Promise<void> {
-        OINOBenchmark.start("doPost")
         let sql:string = "" 
         try {
             let i:number = 0
@@ -232,11 +239,9 @@ export class OINODbApi {
             result.setError(500, "Unhandled exception in doPost: " + e.message, "DoPost")
             result.addDebug("OINO POST SQL [" + sql + "]", "DoPost")
         }
-        OINOBenchmark.end("doPost")
     }
 
     private async _doPut(result:OINODbApiResult, id:string, row:OINODataRow):Promise<void> {
-        OINOBenchmark.start("doPut")
         let sql:string = ""
         try {
             this._validateRowValues(result, row, false)
@@ -255,11 +260,9 @@ export class OINODbApi {
             result.setError(500, "Unhandled exception: " + e.message, "DoPut")
             result.addDebug("OINO POST SQL [" + sql + "]", "DoPut")
         }
-        OINOBenchmark.end("doPut")
     }
 
     private async _doDelete(result:OINODbApiResult, id:string):Promise<void> {
-        OINOBenchmark.start("doDelete")
         let sql:string = ""
         try {
             sql = this.datamodel.printSqlDelete(id)
@@ -275,7 +278,6 @@ export class OINODbApi {
             result.setError(500, "Unhandled exception: " + e.message, "DoDelete")
             result.addDebug("OINO DELETE SQL [" + sql + "]", "DoDelete")
         }
-        OINOBenchmark.end("doDelete")
     }
 
     /**
@@ -289,7 +291,7 @@ export class OINODbApi {
      *
      */
     async doRequest(method:string, id: string, body:string|OINODataRow[]|any, params:OINODbApiRequestParams = API_EMPTY_PARAMS):Promise<OINODbApiResult> {
-        OINOBenchmark.start("doRequest")
+        OINOBenchmark.start("OINODbApi", "doRequest")
         // OINOLog.debug("OINODbApi.doRequest enter", {method:method, id:id, body:body, params:params})
         let result:OINODbApiResult = new OINODbApiResult(params)
         let rows:OINODataRow[] = []
@@ -354,7 +356,7 @@ export class OINODbApi {
         } else {
             result.setError(405, "Unsupported HTTP method '" + method + "'", "DoRequest")
         }
-        OINOBenchmark.end("doRequest")
+        OINOBenchmark.end("OINODbApi", "doRequest", method)
         return result
     }
 }

package/src/OINODbDataField.ts

@@ -250,7 +250,7 @@ export class OINONumberDataField extends OINODbDataField {
     deserializeCell(value: string|null|undefined): OINODataCell {
         if (value === undefined) { 
             return undefined
-        } else if ((value == "") || (value == null)) {
+        } else if ((value === "") || (value === null)) {
             return null
         } else {
             return Number.parseFloat(value) 

package/src/OINODbDataModel.ts

@@ -236,9 +236,9 @@ export class OINODbDataModel {
         const order_sql = params.order?.toSql(this) || ""
         const limit_sql = params.limit?.toSql(this) || ""
         // OINOLog.debug("OINODbDataModel.printSqlSelect", {select_sql:result, filter_sql:filter_sql, order_sql:order_sql})
-        if ((id != "") && (filter_sql != ""))  {
+        if ((id != null) && (id != "") && (filter_sql != ""))  {
             result += "\nWHERE " + this._printSqlPrimaryKeyCondition(id) + " AND " + filter_sql;
-        } else if (id != "") {
+        } else if ((id != null) && (id != "")) {
             result += "\nWHERE " + this._printSqlPrimaryKeyCondition(id);
         } else if (filter_sql != "") {
             result += "\nWHERE " + filter_sql;

package/src/OINODbFactory.ts

@@ -4,8 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { OINOHttpResult } from "../../types/src/OINOResult.js"
-import { OINODbApi, OINODbApiParams, OINODbParams, OINOContentType, OINODbDataModel, OINODbDataField, OINODb, OINODataRow, OINODbConstructor, OINODbApiRequestParams, OINODbSqlFilter, OINOStr, OINOBlobDataField, OINODbApiResult, OINODbDataSet, OINODbModelSet, OINODbConfig, OINONumberDataField, OINODataCell, OINODbSqlOrder, OINODbSqlLimit, OINO_ERROR_PREFIX, OINO_WARNING_PREFIX, OINO_INFO_PREFIX, OINO_DEBUG_PREFIX, OINOLog, OINODbSqlParams, OINOResult } from "./index.js"
+import { OINOHttpResult, OINODbApi, OINODbApiParams, OINODbParams, OINOContentType, OINODbDataModel, OINODbDataField, OINODb, OINODataRow, OINODbConstructor, OINODbApiRequestParams, OINODbSqlFilter, OINOStr, OINOBlobDataField, OINODbApiResult, OINODbDataSet, OINODbModelSet, OINODbConfig, OINONumberDataField, OINODataCell, OINODbSqlOrder, OINODbSqlLimit, OINO_ERROR_PREFIX, OINO_WARNING_PREFIX, OINO_INFO_PREFIX, OINO_DEBUG_PREFIX, OINOLog, OINODbSqlParams, OINOResult } from "./index.js"
 
 /**
  * Static factory class for easily creating things based on data

package/src/OINODbModelSet.ts

@@ -269,15 +269,19 @@ export class OINODbModelSet {
      * field not found or value does not exist.
      * 
      * @param fieldName name of the field
+     * @param serialize serialize the value
      * 
      */
-    getValueByFieldName(fieldName:string):OINODataCell {
+    getValueByFieldName(fieldName:string, serialize:boolean = false):OINODataCell {
         let result:OINODataCell = undefined
         if (!this.dataset.isEof()) {
             const current_row:OINODataRow = this.dataset.getRow()
             const field_index:number = this.datamodel.findFieldIndexByName(fieldName)
             if (field_index >= 0) {
                 result = current_row[field_index]
+                if (serialize) {
+                    result = this.datamodel.fields[field_index].serializeCell(result)            
+                }
             }
         }
         return result

package/src/index.ts

@@ -39,7 +39,7 @@ export type OINODbApiParams = {
     /** Set (minimum) length (12-32 chars) of the hashids */
     hashidLength?:number,
     /** Make hashids static per row/table */
-    hashidRandomIds?: boolean,
+    hashidStaticIds?: boolean,
     /** Name of field that has the modified field */
     cacheModifiedField?:string
 }