fix logic error

Author: barnabasJ

lib/data_layer.ex

@@ -2033,69 +2033,70 @@ defmodule AshPostgres.DataLayer do
       identity = options[:identity]
       keys = Map.get(identity || %{}, :keys) || Ash.Resource.Info.primary_key(resource)
 
-      results_by_identity =
-        result
-        |> elem(1)
-        |> List.wrap()
-        |> Enum.reduce(%{}, fn r, acc ->
-          Map.put(acc, Map.take(r, keys), r)
-        end)
-
       # if it's single the return_skipped_upsert? is handled at the
       # call site https://github.com/ash-project/ash_postgres/blob/0b21d4a99cc3f6d8676947e291ac9b9d57ad6e2e/lib/data_layer.ex#L3046-L3046
-      if options[:return_skipped_upsert?] && !opts[:single?] do
-        [changeset | _] = changesets
+      result =
+        if options[:return_skipped_upsert?] && !opts[:single?] do
+          [changeset | _] = changesets
+
+          results_by_identity =
+            result
+            |> elem(1)
+            |> List.wrap()
+            |> Enum.into(%{}, fn r ->
+              {Map.take(r, keys), r}
+            end)
 
-        ash_query =
-          resource
-          |> Ash.Query.do_filter(
-            or:
-              changesets
-              |> Enum.filter(fn changeset ->
-                not Map.has_key?(
-                  results_by_identity,
-                  Map.take(changeset.attributes, keys)
-                )
+          ash_query =
+            resource
+            |> Ash.Query.do_filter(
+              or:
+                changesets
+                |> Enum.filter(fn changeset ->
+                  not Map.has_key?(
+                    results_by_identity,
+                    Map.take(changeset.attributes, keys)
+                  )
+                end)
+                |> Enum.map(fn changeset ->
+                  changeset.attributes
+                  |> Map.take(keys)
+                  |> Keyword.new()
+                end)
+            )
+            |> then(fn
+              query when is_nil(identity) or is_nil(identity.where) -> query
+              query -> Ash.Query.do_filter(query, identity.where)
+            end)
+            |> Ash.Query.set_tenant(changeset.tenant)
+
+          skipped_upserts =
+            with {:ok, ecto_query} <- Ash.Query.data_layer_query(ash_query),
+                 {:ok, results} <- run_query(ecto_query, resource) do
+              results
+              |> Enum.map(fn result ->
+                Ash.Resource.put_metadata(result, :upsert_skipped, true)
               end)
-              |> Enum.map(fn changeset ->
-                changeset.attributes
-                |> Map.take(identity.keys)
-                |> Keyword.new()
+              |> Enum.reduce(%{}, fn r, acc ->
+                Map.put(acc, Map.take(r, keys), r)
               end)
-          )
-          |> then(fn
-            query when is_nil(identity) or is_nil(identity.where) -> query
-            query -> Ash.Query.do_filter(query, identity.where)
-          end)
-          |> Ash.Query.set_tenant(changeset.tenant)
-
-        skipped_upserts =
-          with {:ok, ecto_query} <- Ash.Query.data_layer_query(ash_query),
-               {:ok, results} <- run_query(ecto_query, resource) do
-            results
-            |> Enum.map(fn result ->
-              Ash.Resource.put_metadata(result, :upsert_skipped, true)
-            end)
-            |> Enum.reduce(%{}, fn r, acc ->
-              Map.put(acc, Map.take(r, keys), r)
-            end)
-          end
+            end
 
-        results =
-          changesets
-          |> Enum.map(fn changeset ->
-            identity =
-              changeset.attributes
-              |> Map.take(keys)
+          results =
+            changesets
+            |> Enum.map(fn changeset ->
+              identity =
+                changeset.attributes
+                |> Map.take(keys)
 
-            Map.get(results_by_identity, identity, Map.get(skipped_upserts, identity))
-          end)
-          |> Enum.filter(& &1)
+              Map.get(results_by_identity, identity, Map.get(skipped_upserts, identity))
+            end)
+            |> Enum.filter(& &1)
 
-        {length(results), results}
-      else
-        result
-      end
+          {length(results), results}
+        else
+          result
+        end
 
       case result do
         {_, nil} ->
@@ -2107,6 +2108,12 @@ defmodule AshPostgres.DataLayer do
 
             {:ok, results}
           else
+            results_by_identity =
+              results
+              |> Enum.into(%{}, fn r ->
+                {Map.take(r, keys), r}
+              end)
+
             results =
               changesets
               |> Enum.map(fn changeset ->