diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-09-26 08:45:53 -0700 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-09-26 16:52:23 +0100 |
| commit | 89e98e278abe8564b80953855fcb4bcb9871c51c (patch) | |
| tree | 68783884a5229c5d0b00f1ec5dbe4f0add9d292f /activerecord/lib/active_record/associations | |
| parent | d6cff931520d9cd29eeff3c867ef200acaae96ae (diff) | |
| download | rails-89e98e278abe8564b80953855fcb4bcb9871c51c.tar.gz rails-89e98e278abe8564b80953855fcb4bcb9871c51c.tar.bz2 rails-89e98e278abe8564b80953855fcb4bcb9871c51c.zip | |
Merge pull request #3030 from htanata/fix_habtm_select_query_method
Fix: habtm doesn't respect select query method
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/association_scope.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/associations/association_scope.rb b/activerecord/lib/active_record/associations/association_scope.rb index a0efdbc2a4..6cc401e6cc 100644 --- a/activerecord/lib/active_record/associations/association_scope.rb +++ b/activerecord/lib/active_record/associations/association_scope.rb @@ -42,10 +42,6 @@ module ActiveRecord select_value ||= options[:uniq] && "DISTINCT #{reflection.quoted_table_name}.*" end - if reflection.macro == :has_and_belongs_to_many - select_value ||= reflection.klass.arel_table[Arel.star] - end - select_value end |