From 230c5a060ba7fe3ac2f78f5975debd04e85167cb Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 7 Jul 2006 17:34:45 +0000 Subject: find_one uses find_every.first instead of find_initial since its primary key constraint obviates find_initial's :limit => 1. References #5635. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4578 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/base.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 812f30c773..1c8c819efa 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -981,7 +981,10 @@ module ActiveRecord #:nodoc: conditions = " AND (#{sanitize_sql(options[:conditions])})" if options[:conditions] options.update :conditions => "#{table_name}.#{primary_key} = #{quote(id,columns_hash[primary_key])}#{conditions}" - if result = find_initial(options) + # Use find_every(options).first since the primary key condition + # already ensures we have a single record. Using find_initial adds + # a superfluous :limit => 1. + if result = find_every(options).first result else raise RecordNotFound, "Couldn't find #{name} with ID=#{id}#{conditions}" -- cgit v1.2.3