feat: improve boolean conversion handling in record processing

Author: DominusKelvin

lib/private/machines/private/process-each-record.js

@@ -42,7 +42,8 @@ module.exports = function processEachRecord(options) {
   // Update the orm object with the keyed collections
   orm.collections = collections
 
-  // Process each record
+  // Process each record using waterline-utils' eachRecordDeep
+  // which handles recursively processing populated associations
   eachRecordDeep(
     records,
     (record, WLModel) => {
@@ -63,9 +64,17 @@ module.exports = function processEachRecord(options) {
         if (columnName in record) {
           switch (attrDef.type) {
             case 'boolean':
-              // SQLite stores booleans as integers, so we need to convert them
+              // SQLite stores booleans as integers (0 = false, 1 = true)
+              // Values may come back as numbers (1, 1.0) or strings ('1', '1.0')
               if (typeof record[columnName] !== 'boolean') {
-                record[columnName] = record[columnName] === 1
+                const rawValue = record[columnName]
+                if (rawValue !== undefined && rawValue !== null) {
+                  const numericValue =
+                    typeof rawValue === 'string'
+                      ? parseFloat(rawValue)
+                      : rawValue
+                  record[columnName] = numericValue !== 0
+                }
               }
               break
 

lib/private/machines/private/process-native-record.js

@@ -27,7 +27,18 @@ module.exports = function processNativeRecord(nativeRecord, WLModel, meta) {
 
   // Check out each known attribute...
   Object.entries(WLModel.attributes).forEach(([attrName, attrDef]) => {
-    const phRecordKey = attrDef.columnName
+    // Use columnName if defined, otherwise fall back to attribute name
+    const columnName = attrDef.columnName || attrName
+
+    // If columnName differs from attrName, we need to rename the key
+    // SQLite returns data with column names, but Waterline expects attribute names
+    if (columnName !== attrName && nativeRecord[columnName] !== undefined) {
+      nativeRecord[attrName] = nativeRecord[columnName]
+      delete nativeRecord[columnName]
+    }
+
+    // Now work with the attribute name
+    const phRecordKey = attrName
 
     // Handle JSON type
     if (
@@ -69,12 +80,14 @@ module.exports = function processNativeRecord(nativeRecord, WLModel, meta) {
     // Handle Boolean type
     if (attrDef.type === 'boolean') {
       // SQLite stores booleans as integers (0 = false, 1 = true)
-      // But they come back as strings, so we need to parse them first
+      // Values may come back as numbers (1, 1.0) or strings ('1', '1.0')
       const rawValue = nativeRecord[phRecordKey]
       if (rawValue !== undefined && rawValue !== null) {
-        const numericValue =
-          typeof rawValue === 'string' ? parseFloat(rawValue) : rawValue
-        nativeRecord[phRecordKey] = numericValue === 0 ? false : true
+        if (typeof rawValue !== 'boolean') {
+          const numericValue =
+            typeof rawValue === 'string' ? parseFloat(rawValue) : rawValue
+          nativeRecord[phRecordKey] = numericValue !== 0
+        }
       }
     }