Fix failing tests for decodeNil()

Fix #1531
groue · Apr 21, 2024 · 7110a1f · 7110a1f
1 parent de382d3
commit 7110a1f
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/GRDB/Record/FetchableRecord+Decodable.swift b/GRDB/Record/FetchableRecord+Decodable.swift
@@ -175,15 +175,25 @@ private struct _RowDecoder<R: FetchableRecord>: Decoder {
 
         func decodeNil(forKey key: Key) throws -> Bool {
             let row = decoder.row
-            if let column = try? decodeColumn(forKey: key), row[column] != nil {
-                return false
+
+            // Column?
+            if let column = try? decodeColumn(forKey: key),
+               let index = row.index(forColumn: column)
+            {
+                return row.hasNull(atIndex: index)
             }
-            if row.scopesTree[key.stringValue] != nil {
-                return false
+
+            // Scope?
+            if let scopedRow = row.scopesTree[key.stringValue] {
+                return scopedRow.containsNonNullValue == false
             }
-            if row.prefetchedRows[key.stringValue] != nil {
+
+            // Prefetched Rows?
+            if let prefetchedRows = row.prefetchedRows[key.stringValue] {
                 return false
             }
+
+            // Unknown key
             return true
         }