valyukov / ex_sieve Goto Github PK

12:30 $ git diff
diff --git a/lib/ex_sieve.ex b/lib/ex_sieve.ex
index 70318ae..05a4365 100644
--- a/lib/ex_sieve.ex
+++ b/lib/ex_sieve.ex
@@ -47,6 +47,6 @@ defmodule ExSieve do
   defp result({:error, reason}, _queryable), do: {:error, reason}
   defp result({:ok, groupings, sorts}, queryable), do: Builder.call(queryable, groupings, sorts)
 
-  defp extract_schema(%{from: {_, schema}}), do: schema
+  defp extract_schema(%{from: %{source: {_, schema}}}), do: schema
   defp extract_schema(schema), do: schema
 end
diff --git a/lib/ex_sieve/builder/join.ex b/lib/ex_sieve/builder/join.ex
index bcc48bc..1b27fde 100644
--- a/lib/ex_sieve/builder/join.ex
+++ b/lib/ex_sieve/builder/join.ex
@@ -61,12 +61,17 @@ defmodule ExSieve.Builder.Join do
   end
 
   defp apply_join({parent, relation} = pr, query) do
-    query
-    |> Macro.escape()
-    |> Join.build(:inner, join_binding(parent), expr(relation), nil, nil, join_as(pr), nil, nil, __ENV__)
-    |> elem(0)
-    |> Code.eval_quoted()
-    |> elem(0)
+    cond do
+      Map.has_key?(query.aliases, relation) ->
+        query
+      true ->
+        query
+        |> Macro.escape()
+        |> Join.build(:inner, join_binding(parent), expr(relation), nil, nil, join_as(pr), nil, nil, __ENV__)
+        |> elem(0)
+        |> Code.eval_quoted()
+        |> elem(0)
+    end
   end