diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-10-21 01:18:41 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-10-21 01:18:41 -0700 |
| commit | 73641563917e3a69b63a1b11c8ebe33c469e8951 (patch) | |
| tree | 9aa72fba480bafb4694e864abaf0a9350ba4a5e8 /activerecord/lib/active_record/relation/finder_methods.rb | |
| parent | 6205476a53865cec15895dc0546a5ececace5b7a (diff) | |
| parent | e2419a451aaeafc166b8677540bc29cd8b0c97fd (diff) | |
| download | rails-73641563917e3a69b63a1b11c8ebe33c469e8951.tar.gz rails-73641563917e3a69b63a1b11c8ebe33c469e8951.tar.bz2 rails-73641563917e3a69b63a1b11c8ebe33c469e8951.zip | |
Merge pull request #12549 from makimoto/raise-when-find-without-pk
Raise an exception when model without primary key calls .find_with_ids
Diffstat (limited to 'activerecord/lib/active_record/relation/finder_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/finder_methods.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb index fe75a32545..ae9717e783 100644 --- a/activerecord/lib/active_record/relation/finder_methods.rb +++ b/activerecord/lib/active_record/relation/finder_methods.rb @@ -297,6 +297,8 @@ module ActiveRecord protected def find_with_ids(*ids) + raise UnknownPrimaryKey.new(@klass) if primary_key.nil? + expects_array = ids.first.kind_of?(Array) return ids.first if expects_array && ids.first.empty? |