From e8375a662bc47647f4bd39779ada018cc634fe97 Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Wed, 4 Jun 2014 06:26:03 -0600 Subject: Use null column for association key types --- .../lib/active_record/associations/preloader/association.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'activerecord/lib/active_record/associations/preloader') diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb index 1b83700613..33c8619359 100644 --- a/activerecord/lib/active_record/associations/preloader/association.rb +++ b/activerecord/lib/active_record/associations/preloader/association.rb @@ -104,13 +104,11 @@ module ActiveRecord end def association_key_type - column = @klass.column_types[association_key_name.to_s] - column && column.type + @klass.column_for_attribute(association_key_name).type end def owner_key_type - column = @model.column_types[owner_key_name.to_s] - column && column.type + @model.column_for_attribute(owner_key_name).type end def load_slices(slices) -- cgit v1.2.3