0
@@ -131,10 +131,6 @@ module ActiveRecord
0
           records.map { |record| record.quoted_id }.join(',')
0
         end
0
 
0
-        def interpolate_sql_options!(options, *keys)
0
-          keys.each { |key| options[key] &&= interpolate_sql(options[key]) }
0
-        end
0
-
0
         def interpolate_sql(sql, record = nil)
0
           @owner.send(:interpolate_sql, sql, record)
0
         end

0
@@ -70,10 +70,8 @@ module ActiveRecord
0
         end
0
 
0
         def construct_sql
0
-          interpolate_sql_options!(@reflection.options, :finder_sql)
0
-
0
           if @reflection.options[:finder_sql]
0
-            @finder_sql = @reflection.options[:finder_sql]
0
+            @finder_sql = interpolate_sql(@reflection.options[:finder_sql])
0
           else
0
             @finder_sql = "#{@owner.connection.quote_table_name @reflection.options[:join_table]}.#{@reflection.primary_key_name} = #{owner_quoted_id} "
0
             @finder_sql << " AND (#{conditions})" if conditions

0
@@ -450,6 +450,13 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
0
     assert_equal developers(:david), active_record.developers_with_finder_sql.find(developers(:david).id), "Ruby find"
0
   end
0
 
0
+  def test_find_in_association_with_custom_finder_sql_and_multiple_interpolations
0
+    # interpolate once:
0
+    assert_equal [developers(:david), developers(:poor_jamis), developers(:jamis)], projects(:active_record).developers_with_finder_sql, "first interpolation"
0
+    # interpolate again, for a different project id
0
+    assert_equal [developers(:david)], projects(:action_controller).developers_with_finder_sql, "second interpolation"
0
+  end
0
+
0
   def test_find_in_association_with_custom_finder_sql_and_string_id
0
     assert_equal developers(:david), projects(:active_record).developers_with_finder_sql.find(developers(:david).id.to_s), "SQL find"
0
   end