wip

Author: mbrandonw

Sources/StructuredQueriesCore/Optional.swift

@@ -275,11 +275,9 @@ extension QueryExpression where QueryValue: _OptionalProtocol {
   public func map<T>(
     _ transform: (SQLQueryExpression<QueryValue.Wrapped>) -> some QueryExpression<T>
   ) -> some QueryExpression<T?> {
-    SQLQueryExpression(
-      """
-      IIF(\(self), \(transform(SQLQueryExpression(queryFragment))), NULL)
-      """
-    )
+    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

@@ -29,7 +29,7 @@ extension SnapshotTests {
         }
       ) {
         """
-        SELECT IIF("optionalIntegers"."value", "increment"("optionalIntegers"."value"), NULL)
+        SELECT CASE "optionalIntegers"."value" IS NULL WHEN 1 THEN NULL ELSE "increment"("optionalIntegers"."value") END
         FROM "optionalIntegers"
         """
       } results: {

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: {