aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/finder_methods.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2017-01-03 15:52:35 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2017-01-03 15:53:03 -0500
commit4b6709e818177792735e99a70ec03210c0ac38dc (patch)
treec351e5643be6e670d47d4204c47c798aa9bf7d32 /activerecord/lib/active_record/relation/finder_methods.rb
parentbc87cd7f18373c0cde87c088c410fb2bf50969a9 (diff)
downloadrails-4b6709e818177792735e99a70ec03210c0ac38dc.tar.gz
rails-4b6709e818177792735e99a70ec03210c0ac38dc.tar.bz2
rails-4b6709e818177792735e99a70ec03210c0ac38dc.zip
Raise ArgumentError when a instance of ActiveRecord::Base is passed to
find and exists?
Diffstat (limited to 'activerecord/lib/active_record/relation/finder_methods.rb')
-rw-r--r--activerecord/lib/active_record/relation/finder_methods.rb12
1 files changed, 5 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb
index dd92f40dee..6663bdb244 100644
--- a/activerecord/lib/active_record/relation/finder_methods.rb
+++ b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -301,8 +301,7 @@ module ActiveRecord
# Person.exists?
def exists?(conditions = :none)
if Base === conditions
- conditions = conditions.id
- ActiveSupport::Deprecation.warn(<<-MSG.squish)
+ raise ArgumentError, <<-MSG.squish
You are passing an instance of ActiveRecord::Base to `exists?`.
Please pass the id of the object by calling `.id`.
MSG
@@ -456,11 +455,10 @@ module ActiveRecord
def find_one(id)
if ActiveRecord::Base === id
- id = id.id
- ActiveSupport::Deprecation.warn(<<-MSG.squish)
- You are passing an instance of ActiveRecord::Base to `find`.
- Please pass the id of the object by calling `.id`.
- MSG
+ raise ArgumentError, <<-MSG.squish
+ You are passing an instance of ActiveRecord::Base to `find`.
+ Please pass the id of the object by calling `.id`.
+ MSG
end
relation = where(primary_key => id)