aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/has_many_through_association.rb
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2006-03-26 00:36:55 +0000
committerRick Olson <technoweenie@gmail.com>2006-03-26 00:36:55 +0000
commit6636eb16c56a8a44be8fb3ec005cfca52b0b5b4c (patch)
treeae3597dd27b869e2e67c431f999c64dc168af0f7 /activerecord/lib/active_record/associations/has_many_through_association.rb
parentc3c39b5cb6756e68f6e84cb17bb691a2af7fea28 (diff)
downloadrails-6636eb16c56a8a44be8fb3ec005cfca52b0b5b4c.tar.gz
rails-6636eb16c56a8a44be8fb3ec005cfca52b0b5b4c.tar.bz2
rails-6636eb16c56a8a44be8fb3ec005cfca52b0b5b4c.zip
Fixed issue that kept :select options from being scoped [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4036 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations/has_many_through_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/has_many_through_association.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb
index 104ed5ba58..dafae89861 100644
--- a/activerecord/lib/active_record/associations/has_many_through_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -106,7 +106,7 @@ module ActiveRecord
def construct_scope
{
- :find => { :from => construct_from, :conditions => construct_conditions, :joins => construct_joins },
+ :find => { :from => construct_from, :conditions => construct_conditions, :joins => construct_joins, :select => construct_select },
:create => { @reflection.primary_key_name => @owner.id }
}
end