correctly pass live header to request

Author: magnetised

lib/phoenix/sync/electric/client_adapter.ex

@@ -25,7 +25,7 @@ defmodule Phoenix.Sync.Electric.ClientAdapter do
           method: :get,
           offset: params["offset"],
           shape_handle: params["handle"],
-          live: params["live"],
+          live: live?(params["live"]),
           next_cursor: params["cursor"]
         )
 
@@ -44,6 +44,7 @@ defmodule Phoenix.Sync.Electric.ClientAdapter do
     end
 
     defp normalise_method(method), do: method |> String.downcase() |> String.to_atom()
+    defp live?(live), do: live == "true"
 
     defp fetch_upstream(sync_client, conn, request) do
       response =

test/phoenix/sync/router_test.exs

@@ -257,6 +257,51 @@ defmodule Phoenix.Sync.RouterTest do
                %{"headers" => %{"operation" => "insert"}, "value" => %{"title" => "three"}}
              ] = Jason.decode!(resp.resp_body)
     end
+
+    @tag table: {
+           "todos",
+           [
+             "id int8 not null primary key generated always as identity",
+             "title text",
+             "completed boolean default false"
+           ]
+         }
+    @tag data: {
+           "todos",
+           ["title", "completed"],
+           [["one", false], ["two", false], ["three", true]]
+         }
+    test "cursor header is correctly returned", _ctx do
+      resp =
+        Phoenix.ConnTest.build_conn()
+        |> Phoenix.ConnTest.get("/sync/query-where", %{offset: "-1"})
+
+      assert [handle] = Plug.Conn.get_resp_header(resp, "electric-handle")
+      assert [offset] = Plug.Conn.get_resp_header(resp, "electric-offset")
+
+      resp =
+        Phoenix.ConnTest.build_conn()
+        |> Phoenix.ConnTest.get("/sync/query-where", %{
+          offset: offset,
+          handle: handle,
+          live: false
+        })
+
+      assert [handle] = Plug.Conn.get_resp_header(resp, "electric-handle")
+      assert [offset] = Plug.Conn.get_resp_header(resp, "electric-offset")
+      assert [_] = Plug.Conn.get_resp_header(resp, "electric-up-to-date")
+
+      resp =
+        Phoenix.ConnTest.build_conn()
+        |> Phoenix.ConnTest.get("/sync/query-where", %{
+          offset: offset,
+          handle: handle,
+          live: true,
+          cursor: ""
+        })
+
+      assert ["0"] = Plug.Conn.get_resp_header(resp, "electric-cursor")
+    end
   end
 
   describe "Plug.Router - shape/2" do

test/support/electric_helpers.ex

@@ -90,7 +90,9 @@ defmodule Support.ElectricHelpers do
       publication_name: publication_name,
       slot_name: "electric_test_slot_#{:erlang.phash2(stack_id)}",
       connection_opts: ctx.db_config,
-      replication_slot_temporary?: true
+      replication_slot_temporary?: true,
+      long_poll_timeout: long_poll_timeout(ctx),
+      allow_shape_deletion?: allow_shape_deletion(ctx)
     }
 
     Map.put(config, :stack_config, config)
@@ -180,6 +182,6 @@ defmodule Support.ElectricHelpers do
 
   defp max_age(ctx), do: Access.get(ctx, :max_age, 60)
   defp stale_age(ctx), do: Access.get(ctx, :stale_age, 300)
-  defp long_poll_timeout(ctx), do: Access.get(ctx, :long_poll_timeout, 20_000)
+  defp long_poll_timeout(ctx), do: Access.get(ctx, :long_poll_timeout, 20)
   defp allow_shape_deletion(ctx), do: Access.get(ctx, :allow_shape_deletion, false)
 end