diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-12 21:17:26 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-12 21:17:26 -0700 |
| commit | 0df9149fd6b0ef4cd9003c1a9c406e2c586c9503 (patch) | |
| tree | 841ea3444753870aac6c70f2d3d99768e12fdf70 /activerecord/lib | |
| parent | 2978af8a7466dbb47f390785b1740462d94821df (diff) | |
| parent | 7cab255a97fceb48e3b59b3d39b5fe58c6dad54b (diff) | |
| download | rails-0df9149fd6b0ef4cd9003c1a9c406e2c586c9503.tar.gz rails-0df9149fd6b0ef4cd9003c1a9c406e2c586c9503.tar.bz2 rails-0df9149fd6b0ef4cd9003c1a9c406e2c586c9503.zip | |
Merge pull request #11791 from versioncontrol/includes_with_persistent_select
Includes with persistent select, fixes #11773
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/finder_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb index d5eb1edf77..8583286de5 100644 --- a/activerecord/lib/active_record/relation/finder_methods.rb +++ b/activerecord/lib/active_record/relation/finder_methods.rb @@ -261,7 +261,7 @@ module ActiveRecord end def construct_relation_for_association_find(join_dependency) - relation = except(:select).select(join_dependency.columns) + relation = except(:select).select(join_dependency.columns + select_values) apply_join_dependency(relation, join_dependency) end |