diff options
author | Yves Senn <yves.senn@gmail.com> | 2015-12-21 10:09:56 +0100 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2015-12-21 10:10:07 +0100 |
commit | 537ac7d6ade61e95f2b70685ff2236b7de965bab (patch) | |
tree | c6193fd9fe4255a50e46d1930a68bce9cffceb20 /activerecord/lib/active_record/associations | |
parent | 9c9c54abe08d86967efd3dcac1d65158a0ff74ea (diff) | |
parent | 9d21a7fc50496c1dabbf0b1ad51094a6e6dc83dc (diff) | |
download | rails-537ac7d6ade61e95f2b70685ff2236b7de965bab.tar.gz rails-537ac7d6ade61e95f2b70685ff2236b7de965bab.tar.bz2 rails-537ac7d6ade61e95f2b70685ff2236b7de965bab.zip |
Merge pull request #22486 from methyl/fix-includes-for-groupped-association
Pass group values when including association
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r-- | activerecord/lib/active_record/associations/preloader/association.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb index e11a5cfb8a..91e7f90739 100644 --- a/activerecord/lib/active_record/associations/preloader/association.rb +++ b/activerecord/lib/active_record/associations/preloader/association.rb @@ -107,7 +107,7 @@ module ActiveRecord @preloaded_records = slices.flat_map do |slice| records_for(slice) end - @preloaded_records.group_by do |record| + @preloaded_records.group_by do |record| convert_key(record[association_key_name]) end end @@ -139,6 +139,10 @@ module ActiveRecord scope.order!(order_values) end + if group_values = preload_values[:group] || values[:group] + scope.group!(group_values) + end + if preload_values[:reordering] || values[:reordering] scope.reordering_value = true end |