Make nil decoding handling for SQLiteRows consistent with the other d…

…rivers (#106) * Make decodeNil handling consistent with the other drivers * Bump CI * Fix tests
vapor · Oct 18, 2023 · b476669 · b476669
1 parent 5caea7d
commit b476669
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,7 +20,7 @@ jobs:
   dependents-check:
     if: ${{ !(github.event.pull_request.draft || false) }}
     runs-on: ubuntu-latest
-    container: swift:5.8-jammy
+    container: swift:5.9-jammy
     steps:
       - name: Check out package
         uses: actions/checkout@v4

diff --git a/Sources/SQLiteKit/SQLiteRow+SQLRow.swift b/Sources/SQLiteKit/SQLiteRow+SQLRow.swift
@@ -8,7 +8,7 @@ extension SQLiteRow: SQLRow {
 
     public func decodeNil(column: String) throws -> Bool {
         guard let data = self.column(column) else {
-            throw MissingColumn(column: column)
+            return true
         }
         return data == .null
     }

diff --git a/Tests/SQLiteKitTests/SQLiteKitTests.swift b/Tests/SQLiteKitTests/SQLiteKitTests.swift
@@ -176,13 +176,13 @@ final class SQLiteKitTests: XCTestCase {
         XCTAssertEqual(try row1.decode(column: "value", as: String?.self), "abc")
         XCTAssertThrowsError(try row1.decode(column: "value", as: Int.self))
         XCTAssertThrowsError(try row1.decode(column: "nonexistent", as: String?.self))
-        XCTAssertThrowsError(try row1.decodeNil(column: "nonexistent"))
+        XCTAssertTrue(try row1.decodeNil(column: "nonexistent"))
         XCTAssertTrue(row2.contains(column: "value"))
         XCTAssertTrue(try row2.decodeNil(column: "value"))
         XCTAssertEqual(try row2.decode(column: "value", as: String?.self), nil)
         XCTAssertThrowsError(try row2.decode(column: "value", as: Int.self))
         XCTAssertThrowsError(try row2.decode(column: "nonexistent", as: String?.self))
-        XCTAssertThrowsError(try row2.decodeNil(column: "nonexistent"))
+        XCTAssertTrue(try row2.decodeNil(column: "nonexistent"))
     }
 
     func testRowEncoding() async throws {