added :piggyback option to has_many :through relationships to pick up values from the join table as needed

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3323 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

5 files changed, 17 insertions, 3 deletions

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 27859d2a1d..f3eaffee84 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* added :piggyback option to has_many :through relationships to pick up values from the join table as needed [Tobias Luetke] 
+
 * Fix typo in association docs. #3296. [Blair Zajac]
 
 * Fixed :through relations when using STI inherited classes would use the inherited class's name as foreign key on the join model [Tobias Luetke] 
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 },
diff --git a/activerecord/test/associations_join_model_test.rb b/activerecord/test/associations_join_model_test.rb
index d53a8d98d3..502e4d28c5 100644
--- a/activerecord/test/associations_join_model_test.rb
+++ b/activerecord/test/associations_join_model_test.rb
@@ -38,5 +38,9 @@ class AssociationsJoinModelTest < Test::Unit::TestCase
   def test_polymorphic_has_many_going_through_join_model_with_inheritance
     assert_equal tags(:general), posts(:thinking).tags.first
   end
+  
+  def test_has_many_with_piggyback
+    assert_equal "2", categories(:sti_test).authors.first.post_id
+  end
     
 end
diff --git a/activerecord/test/fixtures/category.rb b/activerecord/test/fixtures/category.rb
index 01938d1405..d0e0dfb770 100644
--- a/activerecord/test/fixtures/category.rb
+++ b/activerecord/test/fixtures/category.rb
@@ -6,7 +6,7 @@ class Category < ActiveRecord::Base
   end
   
   has_many :categorizations
-  has_many :authors, :through => :categorizations  
+  has_many :authors, :through => :categorizations, :piggyback => [:post_id]  
 end
 
 class SpecialCategory < Category