diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-23 14:37:05 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-23 14:37:05 -0300 |
| commit | 679626e4e151e9a05d64a9898674fb6fd04a55bf (patch) | |
| tree | 924c3dc57271745ac7f72063af683639b469681c /activerecord/lib/active_record/associations | |
| parent | c73f97b0ee2464a400d8b3a892de65687e883d4a (diff) | |
| parent | ae96f229f6501d8635811d6b22d75d43cdb880a4 (diff) | |
| download | rails-679626e4e151e9a05d64a9898674fb6fd04a55bf.tar.gz rails-679626e4e151e9a05d64a9898674fb6fd04a55bf.tar.bz2 rails-679626e4e151e9a05d64a9898674fb6fd04a55bf.zip | |
Merge pull request #15878 from sgrif/sg-null-column
Revert #15502, and add a deprecation warning instead.
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/association.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb index 33c8619359..441768f302 100644 --- a/activerecord/lib/active_record/associations/preloader/association.rb +++ b/activerecord/lib/active_record/associations/preloader/association.rb @@ -104,11 +104,11 @@ module ActiveRecord end def association_key_type - @klass.column_for_attribute(association_key_name).type + @klass.type_for_attribute(association_key_name.to_s).type end def owner_key_type - @model.column_for_attribute(owner_key_name).type + @model.type_for_attribute(owner_key_name.to_s).type end def load_slices(slices) |