@oino-ts/db 0.13.0 → 0.13.2

package/dist/cjs/OINODbDataField.js

@@ -280,14 +280,18 @@ class OINOBlobDataField extends OINODbDataField {
      *
      */
     serializeCell(cellVal) {
+        // console.log("OINOBlobDataField.serializeCell: cellVal", cellVal, typeof(cellVal))
         if ((cellVal === null) || (cellVal === undefined)) {
             return cellVal;
         }
+        else if (cellVal instanceof Buffer) {
+            return cellVal.toString('base64');
+        }
         else if (cellVal instanceof Uint8Array) {
             return Buffer.from(cellVal).toString('base64');
         }
         else {
-            return cellVal.toString();
+            return this.db.parseSqlValueAsCell(cellVal, this.sqlType)?.toString();
         }
     }
     /**

package/dist/cjs/OINODbModelSet.js

@@ -238,18 +238,20 @@ class OINODbModelSet {
         let result = {};
         for (let i = 0; i < fields.length; i++) {
             const f = fields[i];
+            if (f.fieldParams.isPrimaryKey) {
+                primary_key_values.push(f.serializeCell(row[i]) || "");
+            }
             if (this.sqlParams?.select?.isSelected(f) === false) {
                 continue;
             }
-            let value = f.serializeCell(row[i]);
+            let value = f.db.parseSqlValueAsCell(row[i], f.sqlType); // retain original value without serialization
             if (value === undefined) {
                 // skip undefined values
             }
-            else if (value === null) {
+            else if (value === null) { // differentiate null and undefined
                 result[f.name] = null;
             }
             else {
-                value = this._encodeAndHashFieldValue(f, value, index_js_1.OINOContentType.json, primary_key_values, f.name + " " + row_id_seed);
                 result[f.name] = value;
             }
         }
@@ -303,6 +305,10 @@ class OINODbModelSet {
         }
         return result;
     }
+    /**
+     * Export all rows as a record with OINOId as key and object with row cells as values.
+     *
+     */
     async exportAsRecord() {
         const result = {};
         while (!this.dataset.isEof()) {

package/dist/esm/OINODbDataField.js

@@ -273,14 +273,18 @@ export class OINOBlobDataField extends OINODbDataField {
      *
      */
     serializeCell(cellVal) {
+        // console.log("OINOBlobDataField.serializeCell: cellVal", cellVal, typeof(cellVal))
         if ((cellVal === null) || (cellVal === undefined)) {
             return cellVal;
         }
+        else if (cellVal instanceof Buffer) {
+            return cellVal.toString('base64');
+        }
         else if (cellVal instanceof Uint8Array) {
             return Buffer.from(cellVal).toString('base64');
         }
         else {
-            return cellVal.toString();
+            return this.db.parseSqlValueAsCell(cellVal, this.sqlType)?.toString();
         }
     }
     /**

package/dist/esm/OINODbModelSet.js

@@ -235,18 +235,20 @@ export class OINODbModelSet {
         let result = {};
         for (let i = 0; i < fields.length; i++) {
             const f = fields[i];
+            if (f.fieldParams.isPrimaryKey) {
+                primary_key_values.push(f.serializeCell(row[i]) || "");
+            }
             if (this.sqlParams?.select?.isSelected(f) === false) {
                 continue;
             }
-            let value = f.serializeCell(row[i]);
+            let value = f.db.parseSqlValueAsCell(row[i], f.sqlType); // retain original value without serialization
             if (value === undefined) {
                 // skip undefined values
             }
-            else if (value === null) {
+            else if (value === null) { // differentiate null and undefined
                 result[f.name] = null;
             }
             else {
-                value = this._encodeAndHashFieldValue(f, value, OINOContentType.json, primary_key_values, f.name + " " + row_id_seed);
                 result[f.name] = value;
             }
         }
@@ -300,6 +302,10 @@ export class OINODbModelSet {
         }
         return result;
     }
+    /**
+     * Export all rows as a record with OINOId as key and object with row cells as values.
+     *
+     */
     async exportAsRecord() {
         const result = {};
         while (!this.dataset.isEof()) {

package/dist/types/OINODbModelSet.d.ts

@@ -52,5 +52,9 @@ export declare class OINODbModelSet {
      *
      */
     getValueByFieldName(fieldName: string, serialize?: boolean): OINODataCell;
+    /**
+     * Export all rows as a record with OINOId as key and object with row cells as values.
+     *
+     */
     exportAsRecord(): Promise<Record<string, any>>;
 }

package/package.json

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

package/src/OINODbApi.test.ts

@@ -128,6 +128,7 @@ const OWASP_CROSSCHECKS:string[] = [
 Math.random()
 
 OINOLog.setInstance(new OINOConsoleLog(OINOLogLevel.warning))
+// OINOLog.setLogLevel(OINOLogLevel.debug, "@oino-ts/db-mssql", "OINODbMsSql", "printSqlSelect")
 OINODbFactory.registerDb("OINODbBunSqlite", OINODbBunSqlite)
 OINODbFactory.registerDb("OINODbPostgresql", OINODbPostgresql)
 OINODbFactory.registerDb("OINODbMariadb", OINODbMariadb)

package/src/OINODbDataField.ts

@@ -292,14 +292,18 @@ export class OINOBlobDataField extends OINODbDataField {
      *
      */
     serializeCell(cellVal: OINODataCell):string|null|undefined {
+        // console.log("OINOBlobDataField.serializeCell: cellVal", cellVal, typeof(cellVal))
         if ((cellVal === null) || (cellVal === undefined))  {
             return cellVal
 
+        } else if (cellVal instanceof Buffer) {
+            return cellVal.toString('base64')
+
         } else if (cellVal instanceof Uint8Array) {
-            return Buffer.from(cellVal as Uint8Array).toString('base64')
+            return Buffer.from(cellVal).toString('base64')
 
         } else {
-            return cellVal.toString()
+            return this.db.parseSqlValueAsCell(cellVal, this.sqlType)?.toString()
         }
     }
 

package/src/OINODbModelSet.ts

@@ -256,18 +256,20 @@ export class OINODbModelSet {
         let result:any = {}
         for (let i=0; i<fields.length; i++) {
             const f = fields[i]
+            if (f.fieldParams.isPrimaryKey) {
+                primary_key_values.push(f.serializeCell(row[i]) || "")
+            }
             if (this.sqlParams?.select?.isSelected(f) === false) {
                 continue
             }
-            let value:string|null|undefined = f.serializeCell(row[i])
+            let value:OINODataCell = f.db.parseSqlValueAsCell(row[i], f.sqlType) // retain original value without serialization
             if (value === undefined) {
                 // skip undefined values
                 
-            } else if (value === null) {
+            } else if (value === null) { // differentiate null and undefined
                 result[f.name] = null
 
             } else {
-                value = this._encodeAndHashFieldValue(f, value, OINOContentType.json, primary_key_values, f.name + " " + row_id_seed)
                 result[f.name] = value
             }
         }
@@ -329,7 +331,7 @@ export class OINODbModelSet {
      * Export all rows as a record with OINOId as key and object with row cells as values.
      *
      */
-     
+
     async exportAsRecord():Promise<Record<string, any>> {
         const result:Record<string, any> = {}
         while (!this.dataset.isEof()) {