aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/finder_methods.rb
diff options
context:
space:
mode:
authorShimpei Makimoto <makimoto@tsuyabu.in>2013-10-16 03:58:45 +0900
committerShimpei Makimoto <makimoto@tsuyabu.in>2013-10-21 17:07:47 +0900
commite2419a451aaeafc166b8677540bc29cd8b0c97fd (patch)
tree9aa72fba480bafb4694e864abaf0a9350ba4a5e8 /activerecord/lib/active_record/relation/finder_methods.rb
parent6205476a53865cec15895dc0546a5ececace5b7a (diff)
downloadrails-e2419a451aaeafc166b8677540bc29cd8b0c97fd.tar.gz
rails-e2419a451aaeafc166b8677540bc29cd8b0c97fd.tar.bz2
rails-e2419a451aaeafc166b8677540bc29cd8b0c97fd.zip
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.rb2
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?