Ensure uniqueness across all args if no keys are specified

lib/oban/engines/basic.ex

@@ -382,10 +382,19 @@ defmodule Oban.Engines.Basic do
   defp unique_field({changeset, field, keys}, acc) when field in [:args, :meta] do
     value = unique_map_values(changeset, field, keys)
 
-    if value == %{} do
-      dynamic([j], fragment("? <@ ?", field(j, ^field), ^value) and ^acc)
-    else
-      dynamic([j], fragment("? @> ?", field(j, ^field), ^value) and ^acc)
+    cond do
+      value == %{} ->
+        dynamic([j], fragment("? <@ ?", field(j, ^field), ^value) and ^acc)
+
+      keys == [] ->
+        dynamic(
+          [j],
+          fragment("? @> ?", field(j, ^field), ^value) and
+            fragment("? <@ ?", field(j, ^field), ^value) and ^acc
+        )
+
+      true ->
+        dynamic([j], fragment("? @> ?", field(j, ^field), ^value) and ^acc)
     end
   end
 

lib/oban/engines/lite.ex

@@ -296,10 +296,21 @@ defmodule Oban.Engines.Lite do
             |> Changeset.get_field(field)
             |> map_values(keys)
 
-          if value == %{} do
-            dynamic([j], field(j, ^field) == ^value and ^acc)
-          else
-            dynamic([j], json_contains(field(j, ^field), ^Jason.encode!(value)) and ^acc)
+          cond do
+            value == %{} ->
+              dynamic([j], field(j, ^field) == ^value and ^acc)
+
+            keys == [] ->
+              encoded = Jason.encode!(value)
+
+              dynamic(
+                [j],
+                json_contains(field(j, ^field), ^encoded) and
+                  json_contains(^encoded, field(j, ^field)) and ^acc
+              )
+
+            true ->
+              dynamic([j], json_contains(field(j, ^field), ^Jason.encode!(value)) and ^acc)
           end
 
         field, acc ->

test/oban/engine_test.exs

@@ -12,6 +12,13 @@ for engine <- [Oban.Engines.Basic, Oban.Engines.Lite] do
 
     @moduletag lite: engine == Lite
 
+    defmodule MiniUniq do
+      use Oban.Worker, unique: [fields: [:args]]
+
+      @impl Worker
+      def perform(_job), do: :ok
+    end
+
     describe "insert/2" do
       setup :start_supervised_oban
 
@@ -96,13 +103,6 @@ for engine <- [Oban.Engines.Basic, Oban.Engines.Lite] do
 
       @tag :unique
       test "considering empty args distinct from non-empty args", %{name: name} do
-        defmodule MiniUniq do
-          use Oban.Worker, unique: [fields: [:args]]
-
-          @impl Worker
-          def perform(_job), do: :ok
-        end
-
         changeset1 = MiniUniq.new(%{id: 1})
         changeset2 = MiniUniq.new(%{})
 
@@ -114,6 +114,25 @@ for engine <- [Oban.Engines.Basic, Oban.Engines.Lite] do
         assert id_2 == id_3
       end
 
+      @tag :unique
+      test "considering all args to establish uniqueness", %{name: name} do
+        changeset1 = MiniUniq.new(%{id: 1})
+        changeset2 = MiniUniq.new(%{id: 1, extra: :cool_beans})
+
+        assert {:ok, %Job{id: id_1}} = Oban.insert(name, changeset1)
+        assert {:ok, %Job{id: id_2}} = Oban.insert(name, changeset2)
+
+        assert id_1 != id_2
+
+        changeset3 = MiniUniq.new(%{id: 2, extra: :cool_beans})
+        changeset4 = MiniUniq.new(%{id: 2})
+
+        assert {:ok, %Job{id: id_1}} = Oban.insert(name, changeset3)
+        assert {:ok, %Job{id: id_2}} = Oban.insert(name, changeset4)
+
+        assert id_1 != id_2
+      end
+
       @tag :unique
       test "scoping uniqueness by specific meta keys", %{name: name} do
         unique = [fields: [:meta], keys: [:slug]]