diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-07-06 20:13:24 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-07-06 20:13:24 -0700 |
| commit | 1bad08f1168709a657110281f9a9e17c514eda92 (patch) | |
| tree | e3afe448daf430c19d75e1b546a43f819d6fefa9 /activerecord/lib | |
| parent | c6578d64ca13e5089897b06a84e35a313caff84b (diff) | |
| parent | 66dd2d3d10edd501c33a6aead035691a6a54f6c7 (diff) | |
| download | rails-1bad08f1168709a657110281f9a9e17c514eda92.tar.gz rails-1bad08f1168709a657110281f9a9e17c514eda92.tar.bz2 rails-1bad08f1168709a657110281f9a9e17c514eda92.zip | |
Merge pull request #1120 from lysenko/collection_singular_ids
collection_singular_ids ignores association :include option
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index c15ee18e53..3e68f973e7 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -50,7 +50,7 @@ module ActiveRecord else column = "#{reflection.quoted_table_name}.#{reflection.association_primary_key}" - scoped.select(column).except(:includes).map! do |record| + scoped.select(column).map! do |record| record.send(reflection.association_primary_key) end end |