diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-11-25 00:48:00 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-25 00:48:00 +1030 |
| commit | 33039fa7239afdde963fe651637226a7dca4b85b (patch) | |
| tree | 8f27dc90159f788c19c01bdcea2b397753d57836 /activerecord/lib/active_record/reflection.rb | |
| parent | 2f73982c215b6573bfa59e5a89471aedbd7c211a (diff) | |
| parent | 935502062e647def60288944808240667f7893cc (diff) | |
| download | rails-33039fa7239afdde963fe651637226a7dca4b85b.tar.gz rails-33039fa7239afdde963fe651637226a7dca4b85b.tar.bz2 rails-33039fa7239afdde963fe651637226a7dca4b85b.zip | |
Merge pull request #26718 from domcleal/5-0-stable-ids-writer-exception
Restore RecordNotFound when *_ids= can't find records by ID
Diffstat (limited to 'activerecord/lib/active_record/reflection.rb')
| -rw-r--r-- | activerecord/lib/active_record/reflection.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index ef3c3bfae8..17751c9571 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -397,6 +397,10 @@ module ActiveRecord options[:primary_key] || primary_key(klass || self.klass) end + def association_primary_key_type + klass.type_for_attribute(association_primary_key) + end + def active_record_primary_key @active_record_primary_key ||= options[:primary_key] || primary_key(active_record) end |