diff options
| author | Lauro Caetano <laurocaetano1@gmail.com> | 2014-06-02 23:07:02 -0300 |
|---|---|---|
| committer | Lauro Caetano <laurocaetano1@gmail.com> | 2014-06-03 16:20:08 -0300 |
| commit | 2c555ec43ad254ab63cf1e572f999f7521c6cb04 (patch) | |
| tree | a4bb9b3cd4364005ec0f802baae1b93273fc5f64 /activerecord/lib/active_record/associations | |
| parent | 4bcf9029452e0c760af04faab6b549710401e8cf (diff) | |
| download | rails-2c555ec43ad254ab63cf1e572f999f7521c6cb04.tar.gz rails-2c555ec43ad254ab63cf1e572f999f7521c6cb04.tar.bz2 rails-2c555ec43ad254ab63cf1e572f999f7521c6cb04.zip | |
Fix regression on eager loading association based on SQL query rather
than existing column.
Fixes #15480.
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/association.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb index 63773bd5e1..1b83700613 100644 --- a/activerecord/lib/active_record/associations/preloader/association.rb +++ b/activerecord/lib/active_record/associations/preloader/association.rb @@ -104,11 +104,13 @@ module ActiveRecord end def association_key_type - @klass.column_types[association_key_name.to_s].type + column = @klass.column_types[association_key_name.to_s] + column && column.type end def owner_key_type - @model.column_types[owner_key_name.to_s].type + column = @model.column_types[owner_key_name.to_s] + column && column.type end def load_slices(slices) |