fix(postgrest): update parameter of is filter to allow only Bool …

…or `nil` (#382)
supabase · May 13, 2024 · 4ba1c7a · 4ba1c7a
1 parent 625ef8b
commit 4ba1c7a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/Sources/Auth/AuthClient.swift b/Sources/Auth/AuthClient.swift
@@ -699,21 +699,21 @@ public final class AuthClient: Sendable {
   /// - Parameter scope: Specifies which sessions should be logged out.
   public func signOut(scope: SignOutScope = .global) async throws {
     guard let accessToken = currentSession?.accessToken else {
-        configuration.logger?.warning("signOut called without a session")
-        return
+      configuration.logger?.warning("signOut called without a session")
+      return
     }
 
     if scope != .others {
-        await sessionManager.remove()
-        eventEmitter.emit(.signedOut, session: nil)
+      await sessionManager.remove()
+      eventEmitter.emit(.signedOut, session: nil)
     }
 
     do {
       _ = try await api.execute(
         .init(
           url: configuration.url.appendingPathComponent("logout"),
           method: .post,
-          query: [URLQueryItem(name: "scope", value: scope.rawValue)], 
+          query: [URLQueryItem(name: "scope", value: scope.rawValue)],
           headers: [.init(name: "Authorization", value: "Bearer \(accessToken)")]
         )
       )
@@ -936,10 +936,10 @@ public final class AuthClient: Sendable {
         url: configuration.url.appendingPathComponent("user"),
         method: .put,
         query: [
-            (redirectTo ?? configuration.redirectToURL).map { URLQueryItem(
-                name: "redirect_to",
-                value: $0.absoluteString
-            ) },
+          (redirectTo ?? configuration.redirectToURL).map { URLQueryItem(
+            name: "redirect_to",
+            value: $0.absoluteString
+          ) },
         ].compactMap { $0 },
         body: configuration.encoder.encode(user)
       )

diff --git a/Sources/PostgREST/PostgrestFilterBuilder.swift b/Sources/PostgREST/PostgrestFilterBuilder.swift
@@ -254,7 +254,7 @@ public class PostgrestFilterBuilder: PostgrestTransformBuilder {
   ///   - value: The value to filter with
   public func `is`(
     _ column: String,
-    value: any URLQueryRepresentable
+    value: Bool?
   ) -> PostgrestFilterBuilder {
     let queryValue = value.queryValue
     mutableState.withValue {

diff --git a/Tests/IntegrationTests/Potsgrest/PostgrestFilterTests.swift b/Tests/IntegrationTests/Potsgrest/PostgrestFilterTests.swift
@@ -288,7 +288,7 @@ final class PostgrestFilterTests: XCTestCase {
   }
 
   func testIs() async throws {
-    let res = try await client.from("users").select("data").is("data", value: AnyJSON.null)
+    let res = try await client.from("users").select("data").is("data", value: nil)
       .execute()
       .value as AnyJSON
 
@@ -556,7 +556,7 @@ final class PostgrestFilterTests: XCTestCase {
     let res = try await client.from("users")
       .select()
       .eq("username", value: "supabot")
-      .is("data", value: AnyJSON.null)
+      .is("data", value: nil)
       .overlaps("age_range", value: "[1,2)")
       .eq("status", value: "ONLINE")
       .textSearch("catchphrase", query: "cat")

diff --git a/Tests/PostgRESTTests/BuildURLRequestTests.swift b/Tests/PostgRESTTests/BuildURLRequestTests.swift
@@ -169,7 +169,7 @@ final class BuildURLRequestTests: XCTestCase {
       TestCase(name: "query if nil value") { client in
         client.from("users")
           .select()
-          .is("email", value: String?.none)
+          .is("email", value: nil)
       },
       TestCase(name: "likeAllOf") { client in
         client.from("users")