kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

fixed association preloading to use = instead of IN when there's only one record

Browse source 
[#1013 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
This commit is contained in:
rsl 2008-09-10 14:22:05 -04:00 committed by Jeremy Kemper
parent 5bbca48c22
commit 6ce13429cb
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
activerecord/lib/active_record/association_preload.rb
View file

@ -95,7 +95,7 @@ module ActiveRecord
records.each {|record| record.send(reflection.name).loaded} records.each {|record| record.send(reflection.name).loaded}
options = reflection.options options = reflection.options
conditions = "t0.#{reflection.primary_key_name} IN (?)" conditions = "t0.#{reflection.primary_key_name} #{in_or_equals_for_ids(ids)}"
conditions << append_conditions(options, preload_options) conditions << append_conditions(options, preload_options)
associated_records = reflection.klass.find(:all, :conditions => [conditions, ids], associated_records = reflection.klass.find(:all, :conditions => [conditions, ids],
@ -222,8 +222,6 @@ module ActiveRecord
table_name = klass.quoted_table_name table_name = klass.quoted_table_name
primary_key = klass.primary_key primary_key = klass.primary_key
conditions = "#{table_name}.#{connection.quote_column_name(primary_key)} IN (?)"
conditions << append_conditions(options, preload_options)
column_type = klass.columns.detect{|c| c.name == primary_key}.type column_type = klass.columns.detect{|c| c.name == primary_key}.type
ids = id_map.keys.uniq.map do |id| ids = id_map.keys.uniq.map do |id|
if column_type == :integer if column_type == :integer
@ -234,6 +232,8 @@ module ActiveRecord
id id
end end
end end
conditions = "#{table_name}.#{connection.quote_column_name(primary_key)} #{in_or_equals_for_ids(ids)}"
conditions << append_conditions(options, preload_options)
associated_records = klass.find(:all, :conditions => [conditions, ids], associated_records = klass.find(:all, :conditions => [conditions, ids],
:include => options[:include], :include => options[:include],
:select => options[:select], :select => options[:select],
@ -248,10 +248,10 @@ module ActiveRecord
table_name = reflection.klass.quoted_table_name table_name = reflection.klass.quoted_table_name
if interface = reflection.options[:as] if interface = reflection.options[:as]
conditions = "#{reflection.klass.quoted_table_name}.#{connection.quote_column_name "#{interface}_id"} IN (?) and #{reflection.klass.quoted_table_name}.#{connection.quote_column_name "#{interface}_type"} = '#{self.base_class.sti_name}'" conditions = "#{reflection.klass.quoted_table_name}.#{connection.quote_column_name "#{interface}_id"} #{in_or_equals_for_ids(ids)} and #{reflection.klass.quoted_table_name}.#{connection.quote_column_name "#{interface}_type"} = '#{self.base_class.sti_name}'"
else else
foreign_key = reflection.primary_key_name foreign_key = reflection.primary_key_name
conditions = "#{reflection.klass.quoted_table_name}.#{foreign_key} IN (?)" conditions = "#{reflection.klass.quoted_table_name}.#{foreign_key} #{in_or_equals_for_ids(ids)}"
end end
conditions << append_conditions(options, preload_options) conditions << append_conditions(options, preload_options)
@ -277,6 +277,9 @@ module ActiveRecord
sql sql
end end
def in_or_equals_for_ids(ids)
ids.size > 1 ? "IN (?)" : "= ?"
end
end end
end end
end end

2
activerecord/test/cases/inheritance_test.rb
View file

@ -193,7 +193,7 @@ class InheritanceTest < ActiveRecord::TestCase
def test_eager_load_belongs_to_primary_key_quoting def test_eager_load_belongs_to_primary_key_quoting
con = Account.connection con = Account.connection
assert_sql(/\(#{con.quote_table_name('companies')}.#{con.quote_column_name('id')} IN \(1\)\)/) do assert_sql(/\(#{con.quote_table_name('companies')}.#{con.quote_column_name('id')} = 1\)/) do
Account.find(1, :include => :firm) Account.find(1, :include => :firm)
end end
end end