diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-06-04 07:55:59 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-06-04 07:55:59 -0300 |
| commit | c5c0bad190dff0495612dde2ac4e33f1ee1fa387 (patch) | |
| tree | 7a5eb8075773679fc64b12ab32f7aa77ed5c9e97 /activerecord/lib/active_record | |
| parent | 2a6f4282b91d81dca2c58febc84ed98de9bea466 (diff) | |
| parent | 2c555ec43ad254ab63cf1e572f999f7521c6cb04 (diff) | |
| download | rails-c5c0bad190dff0495612dde2ac4e33f1ee1fa387.tar.gz rails-c5c0bad190dff0495612dde2ac4e33f1ee1fa387.tar.bz2 rails-c5c0bad190dff0495612dde2ac4e33f1ee1fa387.zip | |
Merge pull request #15482 from laurocaetano/fix-regression-for-eager-load
Fix regression on eager loading association based on SQL query rather than existing column.
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib/active_record')
| -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) |