diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2013-06-22 03:25:43 -0700 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2013-06-22 03:25:43 -0700 |
| commit | 4f46ef36aaef217834f3f96d3689d32f6a6761ea (patch) | |
| tree | 6a549374c68cbec52f22048245f39c94e5c5247c /activerecord/lib | |
| parent | 88beaee64eeb29bec4a3477dedf6dbbb08b2e108 (diff) | |
| parent | 32420bd4bcf20dc21e925474cbb0ac2b46722b80 (diff) | |
| download | rails-4f46ef36aaef217834f3f96d3689d32f6a6761ea.tar.gz rails-4f46ef36aaef217834f3f96d3689d32f6a6761ea.tar.bz2 rails-4f46ef36aaef217834f3f96d3689d32f6a6761ea.zip | |
Merge pull request #10796 from neerajdotname/10669
flatten merged join_values before building the joins
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index ca1de2d4dc..0200fcf69b 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -802,7 +802,7 @@ module ActiveRecord def build_arel arel = Arel::SelectManager.new(table.engine, table) - build_joins(arel, joins_values) unless joins_values.empty? + build_joins(arel, joins_values.flatten) unless joins_values.empty? collapse_wheres(arel, (where_values - ['']).uniq) |