Update existing tests for new tag structure

Author: robacourt

packages/sync-service/test/electric/plug/router_test.exs

@@ -2789,13 +2789,27 @@ defmodule Electric.Plug.RouterTest do
       task = live_shape_req(req, ctx.opts)
       Postgrex.query!(ctx.db_conn, "UPDATE parent SET other_value = 10 WHERE id = 2")
 
-      tag =
+      # With DNF, WHERE clause `subquery AND field_condition` creates one disjunct with two positions:
+      # - Position 0: value IN (SELECT ...) - references `value` column
+      # - Position 1: other_value >= $1 - references `other_value` column
+      # Tags include both positions concatenated with `/`.
+      # Row id=3 has value=20, other_value=20
+      tag_value =
+        :crypto.hash(:md5, ctx.stack_id <> req.handle <> "v:20")
+        |> Base.encode16(case: :lower)
+
+      tag_other_value =
         :crypto.hash(:md5, ctx.stack_id <> req.handle <> "v:20")
         |> Base.encode16(case: :lower)
 
+      tag = tag_value <> "/" <> tag_other_value
+
       assert {_, 200,
               [
-                %{"headers" => %{"tags" => [^tag]}, "value" => %{"id" => "3"}},
+                %{
+                  "headers" => %{"tags" => [^tag], "active_conditions" => [true, true]},
+                  "value" => %{"id" => "3"}
+                },
                 %{"headers" => %{"control" => "snapshot-end"}},
                 up_to_date_ctl()
               ]} =
@@ -2820,11 +2834,24 @@ defmodule Electric.Plug.RouterTest do
       # Should contain the data record and the snapshot-end control message
       assert length(response) == 2
 
-      tag = :crypto.hash(:md5, ctx.stack_id <> req.handle <> "v:1") |> Base.encode16(case: :lower)
+      # With DNF, WHERE clause `subquery AND field_condition` creates one disjunct with two positions:
+      # - Position 0: "parentId" IN (SELECT ...) - references `parentId` column
+      # - Position 1: "Value" >= $1 - references `Value` column
+      # Tags include both positions concatenated with `/`.
+      # Row id=1 has parentId=1, Value=10
+      tag_parent_id =
+        :crypto.hash(:md5, ctx.stack_id <> req.handle <> "v:1")
+        |> Base.encode16(case: :lower)
+
+      tag_value =
+        :crypto.hash(:md5, ctx.stack_id <> req.handle <> "v:10")
+        |> Base.encode16(case: :lower)
+
+      tag = tag_parent_id <> "/" <> tag_value
 
       assert %{
                "value" => %{"id" => "1", "parentId" => "1", "Value" => "10"},
-               "headers" => %{"tags" => [^tag]}
+               "headers" => %{"tags" => [^tag], "active_conditions" => [true, true]}
              } =
                Enum.find(response, &Map.has_key?(&1, "key"))
 

packages/sync-service/test/electric/shapes/querying_test.exs

@@ -347,10 +347,25 @@ defmodule Electric.Shapes.QueryingTest do
           Querying.stream_initial_data(conn, "dummy-stack-id", "dummy-shape-handle", shape)
         )
 
+      # With DNF decomposition, OR creates two disjuncts:
+      # - Disjunct 1: parent_id IN (SELECT ...) - position 0
+      # - Disjunct 2: parent_id IS NULL - position 1
+      # Both disjuncts reference parent_id, so each row gets two tags (one per disjunct)
+      # with the same hash value (since same column).
+      # active_conditions tracks truth value at each position.
       assert [
-               %{value: %{value: "10", parent_id: "1"}, headers: %{tags: [^tag1]}},
-               %{value: %{value: "20", parent_id: nil}, headers: %{tags: [^tag_null]}},
-               %{value: %{value: "30", parent_id: "2"}, headers: %{tags: [^tag2]}}
+               %{
+                 value: %{value: "10", parent_id: "1"},
+                 headers: %{tags: [^tag1, ^tag1], active_conditions: [true, true]}
+               },
+               %{
+                 value: %{value: "20", parent_id: nil},
+                 headers: %{tags: [^tag_null, ^tag_null], active_conditions: [nil, true]}
+               },
+               %{
+                 value: %{value: "30", parent_id: "2"},
+                 headers: %{tags: [^tag2, ^tag2], active_conditions: [true, true]}
+               }
              ] = result
     end