From 899a8014135b1486c693e924fe0e0d6040bf0663 Mon Sep 17 00:00:00 2001
From: Mehmet Emin INAC <mehmetemininac@gmail.com>
Date: Mon, 15 Jan 2018 12:03:38 +0100
Subject: Fix relation merger issue with `left_outer_joins`

---
 activerecord/lib/active_record/relation/query_methods.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'activerecord/lib/active_record/relation/query_methods.rb')

diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 0f02096593..86882c7ce7 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -979,6 +979,8 @@ module ActiveRecord
           case join
           when Hash, Symbol, Array
             :association_join
+          when ActiveRecord::Associations::JoinDependency
+            :stashed_join
           else
             raise ArgumentError, "only Hash, Symbol and Array are allowed"
           end
-- 
cgit v1.2.3