@@ -0,0 +1,5 @@
+---
+'@core/sync-service': patch
+---
+
+Fix `DELETE /v1/shape` so a shape can be deleted by its definition. The delete plug discarded every shape parameter other than `table` and `handle`, so any shape with a `where`, `columns`, `params`, `replica` or `log` could only ever be deleted by handle.
@@ -12,10 +12,11 @@ defmodule Electric.Plug.DeleteShapePlug do
   defp validate_request(%Plug.Conn{assigns: %{config: config}} = conn, _) do
     api = Access.fetch!(config, :api)
 
-    all_params =
-      Map.merge(conn.query_params, conn.path_params)
-      |> Map.take(["table", "handle"])
-      |> Map.put("offset", "-1")
+    # No filtering here: `Api.Params` casting drops unknown parameters and
+    # `validate_for_delete/2` ignores request-only ones such as `offset` and
+    # `live`, so the shape definition is built from the same parameters a GET
+    # request would use.
+    all_params = Map.merge(conn.query_params, conn.path_params)
 
     case Api.validate_for_delete(api, all_params) do
       {:ok, request} ->
 
@@ -21,6 +21,7 @@ defmodule Electric.Plug.DeleteShapePlugTest do
     flags: %{selects_all_columns: true}
   }
   @test_pg_id "12345"
+  @inspector {__MODULE__, []}
 
   def load_column_info(@users_oid, _),
     do:
@@ -38,6 +39,8 @@ defmodule Electric.Plug.DeleteShapePlugTest do
     Plug.Test.conn(method, "/" <> query_string)
   end
 
+  def query_string(params), do: "?" <> URI.encode_query(params)
+
   def call_delete_shape_plug(conn, ctx, allow \\ true) do
     config =
       Electric.Shapes.Api.plug_opts(
@@ -47,7 +50,7 @@ defmodule Electric.Plug.DeleteShapePlugTest do
         pg_id: @test_pg_id,
         shape_cache: {Electric.ShapeCache, []},
         storage: {Mock.Storage, []},
-        inspector: {__MODULE__, []},
+        inspector: @inspector,
         registry: @registry,
         long_poll_timeout: Access.get(ctx, :long_poll_timeout, 20_000),
         max_age: Access.get(ctx, :max_age, 60),
@@ -135,6 +138,24 @@ defmodule Electric.Plug.DeleteShapePlugTest do
              }
     end
 
+    test "returns 400 for a malformed request-only param", ctx do
+      # Request-only params such as `live` are ignored by delete validation,
+      # but they still go through schema casting, so malformed values are
+      # rejected rather than silently dropped.
+      conn =
+        ctx
+        |> conn("DELETE", query_string(table: "public.users", live: "banana"))
+        |> call_delete_shape_plug(ctx)
+
+      assert conn.status == 400
+      assert Plug.Conn.get_resp_header(conn, "cache-control") == ["no-cache"]
+
+      assert Jason.decode!(conn.resp_body) == %{
+               "message" => "Invalid request",
+               "errors" => %{"live" => ["is invalid"]}
+             }
+    end
+
     test "should clean shape based on shape definition", ctx do
       %{stack_id: stack_id} = ctx
 
@@ -151,6 +172,63 @@ defmodule Electric.Plug.DeleteShapePlugTest do
       assert Plug.Conn.get_resp_header(conn, "cache-control") == ["no-cache"]
     end
 
+    test "should clean shape based on shape definition with a where clause", ctx do
+      %{stack_id: stack_id} = ctx
+
+      shape = Shape.new!("public.users", where: "id = 1", inspector: @inspector)
+      {:ok, shape_handle} = Electric.ShapeCache.ShapeStatus.add_shape(stack_id, shape)
+
+      expect_shape_cache(clean_shape: fn ^shape_handle, ^stack_id -> :ok end)
+
+      conn =
+        ctx
+        |> conn(:delete, query_string(table: "public.users", where: "id = 1"))
+        |> call_delete_shape_plug(ctx)
+
+      assert conn.status == 202
+    end
+
+    test "should clean shape based on shape definition with a parameterised where clause", ctx do
+      %{stack_id: stack_id} = ctx
+
+      shape =
+        Shape.new!("public.users",
+          where: "id = $1",
+          params: %{"1" => "1"},
+          inspector: @inspector
+        )
+
+      {:ok, shape_handle} = Electric.ShapeCache.ShapeStatus.add_shape(stack_id, shape)
+
+      expect_shape_cache(clean_shape: fn ^shape_handle, ^stack_id -> :ok end)
+
+      conn =
+        ctx
+        |> conn(
+          :delete,
+          query_string([{"table", "public.users"}, {"where", "id = $1"}, {"params[1]", "1"}])
+        )
+        |> call_delete_shape_plug(ctx)
+
+      assert conn.status == 202
+    end
+
+    test "should clean shape based on shape definition with a column selection", ctx do
+      %{stack_id: stack_id} = ctx
+
+      shape = Shape.new!("public.users", columns: ["id"], inspector: @inspector)
+      {:ok, shape_handle} = Electric.ShapeCache.ShapeStatus.add_shape(stack_id, shape)
+
+      expect_shape_cache(clean_shape: fn ^shape_handle, ^stack_id -> :ok end)
+
+      conn =
+        ctx
+        |> conn(:delete, query_string(table: "public.users", columns: "id"))
+        |> call_delete_shape_plug(ctx)
+
+      assert conn.status == 202
+    end
+
     test "should clean shape based only on shape_handle", ctx do
       %{stack_id: stack_id} = ctx
 
 
@@ -292,6 +292,32 @@ defmodule Electric.Plug.RouterTest do
              ] = response
     end
 
+    @tag with_sql: [
+           "INSERT INTO items VALUES (gen_random_uuid(), 'test value 1')"
+         ]
+    test "DELETE deletes a shape that was defined with a where clause", %{opts: opts} do
+      where = "value = 'test value 1'"
+
+      conn =
+        conn("GET", "/v1/shape?table=items&offset=-1", %{where: where})
+        |> Router.call(opts)
+
+      assert %{status: 200} = conn
+      shape1_handle = get_resp_shape_handle(conn)
+
+      # The shape must be resolvable by its definition, not just by its handle.
+      assert %{status: 202} =
+               conn("DELETE", "/v1/shape?" <> URI.encode_query(table: "items", where: where))
+               |> Router.call(opts)
+
+      conn =
+        conn("GET", "/v1/shape?table=items&offset=-1", %{where: where})
+        |> Router.call(opts)
+
+      assert %{status: 200} = conn
+      assert get_resp_shape_handle(conn) != shape1_handle
+    end
+
     @tag with_sql: ["INSERT INTO items VALUES (gen_random_uuid(), 'test value 1')"]
     test "follows a table and returns last-seen lsn", %{
       opts: opts,
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@core/sync-service': patch
 +---
++
 +Fix `DELETE /v1/shape` so a shape can be deleted by its definition. The delete plug discarded every shape parameter other than `table` and `handle`, so any shape with a `where`, `columns`, `params`, `replica` or `log` could only ever be deleted by handle.