diff options
Diffstat (limited to 'activerecord/lib')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_through_association.rb | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 583f5f8044..8ee6eca15f 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -881,7 +881,7 @@ module ActiveRecord :class_name, :table_name, :foreign_key, :exclusively_dependent, :dependent, :select, :conditions, :include, :order, :group, :limit, :offset, - :as, :through, + :as, :through, :piggyback, :finder_sql, :counter_sql, :before_add, :after_add, :before_remove, :after_remove, :extend 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 8c91aeeed4..3a3966bb8a 100644 --- a/activerecord/lib/active_record/associations/has_many_through_association.rb +++ b/activerecord/lib/active_record/associations/has_many_through_association.rb @@ -39,7 +39,7 @@ module ActiveRecord def find_target @reflection.klass.find(:all, - :select => "#{@reflection.table_name}.*", + :select => construct_select, :conditions => construct_conditions, :from => construct_from, :order => @reflection.options[:order], @@ -73,6 +73,14 @@ module ActiveRecord "#{@reflection.table_name}, #{@owner.class.reflections[@reflection.options[:through]].table_name}" end + def construct_select + selected = ["#{@reflection.table_name}.*"] + if @reflection.options[:piggyback] + selected += [@reflection.options[:piggyback]].flatten.collect { |field| "#{@owner.class.reflections[@reflection.options[:through]].table_name}.#{field}" } + end + selected.join(', ') + end + def construct_scope { :find => { :conditions => construct_conditions }, |