github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-26 23:08:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Updated has_and_belongs_to_many association to fix :finder_sql interpolation. [#848 state:resolved]

Browse Source 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
This commit is contained in:
Nathan Witmer
2008-08-16 13:38:01 -06:00
committed by Pratik Naik
parent 2b69a636c4
commit 8cfdcdb35d
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
activerecord/lib/active_record/associations/association_proxy.rb
View File

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

4
activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
View File

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

7
activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
View File

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