@@ -188,7 +188,6 @@ module ActiveRecord through_records end - # FIXME: quoting def preload_belongs_to_association(records, reflection, preload_options={}) options = reflection.options primary_key_name = reflection.primary_key_name @@ -227,9 +226,19 @@ module ActiveRecord table_name = klass.quoted_table_name primary_key = klass.primary_key - conditions = "#{table_name}.#{primary_key} IN (?)" + conditions = "#{table_name}.#{connection.quote_column_name(primary_key)} IN (?)" conditions << append_conditions(options, preload_options) - associated_records = klass.find(:all, :conditions => [conditions, id_map.keys.uniq], + column_type = klass.columns.detect{|c| c.name == primary_key}.type + ids = id_map.keys.uniq.map do |id| + if column_type == :integer + id.to_i + elsif column_type == :float + id.to_f + else + id + end + end + associated_records = klass.find(:all, :conditions => [conditions, ids], :include => options[:include], :select => options[:select], :joins => options[:joins], activerecord/lib/active_record/association_preload.rb @@ -191,6 +191,13 @@ class InheritanceTest < ActiveRecord::TestCase assert_not_nil account.instance_variable_get("@firm"), "nil proves eager load failed" end + def test_eager_load_belongs_to_primary_key_quoting + con = Account.connection + assert_sql(/\(#{con.quote_table_name('companies')}.#{con.quote_column_name('id')} IN \(1\)\)/) do + Account.find(1, :include => :firm) + end + end + def test_alt_eager_loading switch_to_alt_inheritance_column test_eager_load_belongs_to_something_inherited activerecord/test/cases/inheritance_test.rb cd9b24286a90111a08002e0da753198c5fb2432a Tiago Macedo tmacedo@webreakstuff.com http://github.com/rails/rails/commit/76df9fa0680d62ce41fa6f3b743c605101d101d2 76df9fa0680d62ce41fa6f3b743c605101d101d2 2008-07-14T15:34:19-07:00 2008-07-10T20:18:41-07:00 Fix integer quoting issues in association preload. [#602 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> c33756ffab05d20ac904fcdda2dc27955a4fac3e Pratik Naik pratiknaik@gmail.com