Fix upsert (supabase-community#44)

unorderly · Jul 14, 2023 · aaf7ef2 · aaf7ef2
1 parent 737dc52
commit aaf7ef2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/Sources/PostgREST/PostgrestQueryBuilder.swift b/Sources/PostgREST/PostgrestQueryBuilder.swift
@@ -79,14 +79,13 @@ public final class PostgrestQueryBuilder: PostgrestBuilder {
     onConflict: String? = nil,
     returning: PostgrestReturningOptions = .representation,
     count: CountOption? = nil,
-    ignoreDuplicates: Bool? = nil
+    ignoreDuplicates: Bool = false
   ) -> PostgrestFilterBuilder {
     method = "POST"
     var prefersHeaders = [
-      ignoreDuplicates.map { "resolution=\($0 ? "ignore" : "merge")-duplicates" },
+      "resolution=\(ignoreDuplicates ? "ignore" : "merge")-duplicates",
       "return=\(returning.rawValue)",
     ]
-    .compactMap { $0 }
     if let onConflict = onConflict {
       appendSearchParams(name: "on_conflict", value: onConflict)
     }

diff --git a/Tests/PostgRESTTests/BuildURLRequestTests.swift b/Tests/PostgRESTTests/BuildURLRequestTests.swift
@@ -78,6 +78,14 @@
             .select()
             .contains(column: "name", value: ["is:online", "faction:red"])
         },
+        TestCase(name: "test upsert not ignoring duplicates") { client in
+          client.from("users")
+            .upsert(values: ["email": "[email protected]"])
+        },
+        TestCase(name: "test upsert ignoring duplicates") { client in
+          client.from("users")
+            .upsert(values: ["email": "[email protected]"], ignoreDuplicates: true)
+        },
       ]
 
       for testCase in testCases {

diff --git a/...s/__Snapshots__/BuildURLRequestTests/testBuildRequest.test-upsert-ignoring-duplicates.txt b/...s/__Snapshots__/BuildURLRequestTests/testBuildRequest.test-upsert-ignoring-duplicates.txt
@@ -0,0 +1,7 @@
+curl \
+	--request POST \
+	--header "Accept: application/json" \
+	--header "Content-Type: application/json" \
+	--header "Prefer: resolution=ignore-duplicates,return=representation" \
+	--data "{\"email\":\"[email protected]\"}" \
+	"https://example.supabase.co/users"
diff --git a/...Snapshots__/BuildURLRequestTests/testBuildRequest.test-upsert-not-ignoring-duplicates.txt b/...Snapshots__/BuildURLRequestTests/testBuildRequest.test-upsert-not-ignoring-duplicates.txt
@@ -0,0 +1,7 @@
+curl \
+	--request POST \
+	--header "Accept: application/json" \
+	--header "Content-Type: application/json" \
+	--header "Prefer: resolution=merge-duplicates,return=representation" \
+	--data "{\"email\":\"[email protected]\"}" \
+	"https://example.supabase.co/users"