A better implementation for 'map'

Sources/StructuredQueriesCore/Optional.swift

@@ -275,7 +275,9 @@ extension QueryExpression where QueryValue: _OptionalProtocol {
   public func map<T>(
     _ transform: (SQLQueryExpression<QueryValue.Wrapped>) -> some QueryExpression<T>
   ) -> some QueryExpression<T?> {
-    SQLQueryExpression(transform(SQLQueryExpression(queryFragment)).queryFragment)
+    Case(SQLQueryExpression("\(self) IS NULL"))
+      .when(SQLQueryExpression("1"), then: SQLQueryExpression("NULL"))
+      .else(SQLQueryExpression(transform(SQLQueryExpression(queryFragment)).queryFragment))
   }
 
   /// Creates a new optional expression from this one by applying an unwrapped version of this

Tests/StructuredQueriesTests/MapTests.swift

@@ -0,0 +1,54 @@
+import Dependencies
+import Foundation
+import InlineSnapshotTesting
+import SQLite3
+import StructuredQueries
+import StructuredQueriesSQLite
+import StructuredQueriesTestSupport
+import Testing
+import _StructuredQueriesSQLite
+
+extension SnapshotTests {
+  @Suite struct MapTests {
+    @Dependency(\.defaultDatabase) var database
+
+    @Test func mapWithDatabaseFunction() throws {
+      $increment.install(database.handle)
+      try database.execute("""
+        CREATE TABLE "optionalIntegers" (
+          "value" INTEGER
+        ) STRICT
+        """)
+      try database.execute("""
+        INSERT INTO "optionalIntegers" ("value") VALUES (1), (NULL), (3)
+        """)
+
+      assertQuery(
+        OptionalInteger.select {
+          $0.value.map { $increment($0) }
+        }
+      ) {
+        """
+        SELECT CASE "optionalIntegers"."value" IS NULL WHEN 1 THEN NULL ELSE "increment"("optionalIntegers"."value") END
+        FROM "optionalIntegers"
+        """
+      } results: {
+        """
+        ┌─────┐
+        │ 2   │
+        │ nil │
+        │ 4   │
+        └─────┘
+        """
+      }
+    }
+  }
+}
+
+@Table struct OptionalInteger {
+  let value: Int?
+}
+@DatabaseFunction(isDeterministic: true)
+private func increment(_ value: Int) -> Int {
+  value + 1
+}

Tests/StructuredQueriesTests/SelectTests.swift

@@ -1369,7 +1369,7 @@ extension SnapshotTests {
         }
         assertQuery(query) {
           """
-          SELECT ("reminders"."priority") < (3)
+          SELECT CASE "reminders"."priority" IS NULL WHEN 1 THEN NULL ELSE ("reminders"."priority") < (3) END
           FROM "reminders"
           """
         } results: {