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

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