fix: handle double select issue

chore: update for 1.18
ash-project · Dec 19, 2024 · d2657c1 · d2657c1
1 parent 056979c
commit d2657c1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
 erlang 27.0.1
-elixir 1.18.0-rc.0-otp-27
+elixir 1.18.0-otp-27
diff --git a/lib/data_layer.ex b/lib/data_layer.ex
@@ -1109,6 +1109,7 @@ defmodule AshPostgres.DataLayer do
         data_layer_query =
           data_layer_query
           |> Ecto.Query.exclude(:distinct)
+          |> Ecto.Query.exclude(:select)
 
         if query.__ash_bindings__[:__order__?] do
           {:ok,
@@ -1149,10 +1150,12 @@ defmodule AshPostgres.DataLayer do
 
     case lateral_join_source_query(query, source_query) do
       {:ok, data_layer_query} ->
+        data_layer_query = Ecto.Query.exclude(data_layer_query, :select)
+
         through_resource
         |> Ash.Query.new()
         |> Ash.Query.put_context(:data_layer, %{
-          start_bindings_at: data_layer_query.__ash_bindings__.current
+          start_bindings_at: Map.get(data_layer_query, :__ash_bindings__)[:current]
         })
         |> Ash.Query.set_context(through_relationship.context)
         |> Ash.Query.do_filter(through_relationship.filter)
@@ -1168,6 +1171,7 @@ defmodule AshPostgres.DataLayer do
         end
         |> case do
           {:ok, through_query} ->
+              through_query = Ecto.Query.exclude(through_query, :select)
             if query.__ash_bindings__[:__order__?] do
               subquery =
                 subquery(
@@ -1180,7 +1184,7 @@ defmodule AshPostgres.DataLayer do
                         source_query,
                         relationship.through
                       ),
-                    as: ^data_layer_query.__ash_bindings__.current,
+                    as: ^Map.get(data_layer_query, :__ash_bindings__)[:current],
                     on:
                       field(through, ^destination_attribute_on_join_resource) ==
                         field(destination, ^destination_attribute),
@@ -1197,7 +1201,6 @@ defmodule AshPostgres.DataLayer do
                   )
                 )
 
-              data_layer_query = Ecto.Query.exclude(data_layer_query, :distinct)
 
               {:ok,
                from(source in data_layer_query,
@@ -1220,7 +1223,7 @@ defmodule AshPostgres.DataLayer do
                         source_query,
                         relationship.through
                       ),
-                    as: ^data_layer_query.__ash_bindings__.current,
+                    as: ^Map.get(data_layer_query, :__ash_bindings__)[:current],
                     on:
                       field(through, ^destination_attribute_on_join_resource) ==
                         field(destination, ^destination_attribute),