Ticket #7576: has_and_belongs_to_many_interpolation.diff

activerecord/test/associations_test.rb

@@ -370 +370 @@
-    assert_equal 10, firm.clients_with_interpolated_conditions.first.rating
-  end
-
+  def test_finder_sql_interpolated_for_each_instance_on_has_and_belongs_to_many
+    first_post = Post.find(:first)
+    first_post.categories.create(:name => 'Interpolated First')
+    last_post = Post.find(:all).last
+    last_post.categories.create(:name => 'Interpolated Last')
+    assert_not_equal first_post, last_post
+    assert_not_equal first_post.categories_with_interpolated_finder_sql, last_post.categories_with_interpolated_finder_sql
+  end
+
-  def test_assignment_before_child_saved
-    firm = Firm.find(1)
-    firm.account = a = Account.new("credit_limit" => 1000)

activerecord/test/fixtures/post.rb

@@ -19 +19 @@
-
-  has_and_belongs_to_many :categories
-  has_and_belongs_to_many :special_categories, :join_table => "categories_posts", :association_foreign_key => 'category_id'
+  has_and_belongs_to_many :categories_with_interpolated_finder_sql, :class_name => 'Category', :finder_sql => 'select categories.* from categories_posts, categories where post_id=#{id} and categories.id=category_id'
-
-  has_many :taggings, :as => :taggable
-  has_many :tags, :through => :taggings, :include => :tagging do

activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb

@@ -136 +136 @@
-        end
-        
-        def construct_sql
-          interpolate_sql_options!(@reflection.options, :finder_sql)
-
-          if @reflection.options[:finder_sql]
-@reflection.options[:finder_sql]
+interpolate_sql(@reflection.options[:finder_sql])
-          else
-            @finder_sql = "#{@reflection.options[:join_table]}.#{@reflection.primary_key_name} = #{@owner.quoted_id} "
-            @finder_sql << " AND (#{conditions})" if conditions