diff options
| author | Mehmet Emin INAC <mehmetemininac@gmail.com> | 2018-01-15 12:03:38 +0100 |
|---|---|---|
| committer | Mehmet Emin INAC <mehmetemininac@gmail.com> | 2018-01-15 16:06:00 +0100 |
| commit | 899a8014135b1486c693e924fe0e0d6040bf0663 (patch) | |
| tree | fbb847627b713f25a46abf6f897b27ecea7b54b8 /activerecord/lib/active_record/relation/query_methods.rb | |
| parent | 562dd0494a90d9d47849f052e8913f0050f3e494 (diff) | |
| download | rails-899a8014135b1486c693e924fe0e0d6040bf0663.tar.gz rails-899a8014135b1486c693e924fe0e0d6040bf0663.tar.bz2 rails-899a8014135b1486c693e924fe0e0d6040bf0663.zip | |
Fix relation merger issue with `left_outer_joins`
Diffstat (limited to 'activerecord/lib/active_record/relation/query_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 2 |
1 files changed, 2 insertions, 0 deletions
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 |