Changeset 4007

Timestamp:

03/21/06 16:33:22 (3 years ago)

Author:

rick

Message:

Allow overriding of find parameters in scoped has_many :through calls [Rick Olson]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations/has_many_through_association.rb (modified) (3 diffs)
• trunk/activerecord/test/associations_join_model_test.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures/post.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
+* Allow overriding of find parameters in scoped has_many :through calls [Rick Olson]
+
+  In this example, :include => false disables the default eager association from loading.  :select changes the standard
+  select clause.  :joins specifies a join that is added to the end of the has_many :through query.
+  
+    class Post < ActiveRecord::Base
+      has_many :tags, :through => :taggings, :include => :tagging do
+        def add_joins_and_select
+          find :all, :select => 'tags.*, authors.id as author_id', :include => false,
+            :joins => 'left outer join posts on taggings.taggable_id = posts.id left outer join authors on posts.author_id = authors.id'
+        end
+      end
+    end
+    
-* Fixed that schema changes while the database was open would break any connections to a SQLite database (now we reconnect if that error is throw) [DHH]
-

trunk/activerecord/lib/active_record/associations/has_many_through_association.rb

@@ -25 +25 @@
-        end
-        
-  = construct_select
-    
-  = construct_joins
-||= @reflection.source_reflection.options[:include]
+= construct_select(options[:select])
+||
+= construct_joins(options[:joins])
+= @reflection.source_reflection.options[:include] if options[:include].nil?
-        
-        merge_options_from_reflection!(options)
@@ -85 +85 @@
-        end
-        
-
-
+(custom_select = nil)
+custom_select || 
-        end
-        
-
+(custom_joins = nil)
-          if @reflection.through_reflection.options[:as] || @reflection.source_reflection.macro == :belongs_to
-            reflection_primary_key = @reflection.klass.primary_key
@@ -97 +97 @@
-            source_primary_key     = @reflection.klass.primary_key
-          end
-
-
+
+ #{custom_joins}
-            @reflection.through_reflection.table_name,
-            @reflection.table_name, reflection_primary_key,

trunk/activerecord/test/associations_join_model_test.rb

@@ -64 +64 @@
-  end
-
+  def test_polymorphic_has_many_going_through_join_model_with_disabled_include
+    assert_equal tags(:general), tag = posts(:welcome).tags.add_joins_and_select.first
+    assert_queries 1 do
+      tag.tagging
+    end
+  end
+
+  def test_polymorphic_has_many_going_through_join_model_with_custom_select_and_joins
+    assert_equal tags(:general), tag = posts(:welcome).tags.add_joins_and_select.first
+    tag.author_id
+  end
-
-  def test_polymorphic_has_many_going_through_join_model_with_custom_foreign_key

trunk/activerecord/test/fixtures/post.rb

@@ -22 +22 @@
-
-  has_many :taggings, :as => :taggable
-
+
+
+
+
+
+
+
-  has_many :funky_tags, :through => :taggings, :class_name => 'Tag'
-  has_many :super_tags, :through => :taggings