From 2b2f5f1646d7baae4b8fac65011365db970c8a95 Mon Sep 17 00:00:00 2001
From: Zach Daniel <zach@zachdaniel.dev>
Date: Fri, 2 Jul 2021 11:08:31 -0400
Subject: [PATCH] fix: retain parent as bindings

---
 lib/data_layer.ex | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/data_layer.ex b/lib/data_layer.ex
index f03517c..4051cf0 100644
--- a/lib/data_layer.ex
+++ b/lib/data_layer.ex
@@ -2108,7 +2108,9 @@ defmodule AshPostgres.DataLayer do
                         expr:
                           {:==, [],
                            [
-                             {{:., [], [{:&, [], [0]}, relationship.destination_field]}, [], []},
+                             {{:., [],
+                               [{:&, [], [current_binding]}, relationship.destination_field]}, [],
+                              []},
                              {{:., [],
                                [{:parent_as, [], [alias_index]}, relationship.source_field]}, [],
                               []}
@@ -2130,7 +2132,7 @@ defmodule AshPostgres.DataLayer do
                         field(row, ^relationship.source_field) ==
                           field(destination, ^relationship.destination_field)
                     )
-                    |> Map.put(:aliases, %{alias_index => 0})
+                    |> Map.update!(:aliases, &Map.put(&1, alias_index, current_binding))
 
                   {q, query.__ash_bindings__.alias_index + 1}