aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation
diff options
context:
space:
mode:
authorKuldeep Aggarwal <kd.engineer@yahoo.co.in>2014-01-25 02:29:23 +0530
committerKuldeep Aggarwal <kd.engineer@yahoo.co.in>2014-01-25 02:29:23 +0530
commit3a0ddf33945219ea65777c1813902d783245739d (patch)
tree15046447baa5423d672c116e273c9192bd2e2878 /activerecord/lib/active_record/relation
parent0d24946903853e09fce1824d28d3ad7b210b71b5 (diff)
downloadrails-3a0ddf33945219ea65777c1813902d783245739d.tar.gz
rails-3a0ddf33945219ea65777c1813902d783245739d.tar.bz2
rails-3a0ddf33945219ea65777c1813902d783245739d.zip
Fix `ActiveRecord::RecordNotFound` error message with custom primary key
Diffstat (limited to 'activerecord/lib/active_record/relation')
-rw-r--r--activerecord/lib/active_record/relation/finder_methods.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb
index 2dd1e6f14b..01d46f7676 100644
--- a/activerecord/lib/active_record/relation/finder_methods.rb
+++ b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -311,9 +311,9 @@ module ActiveRecord
conditions = " [#{conditions}]" if conditions
if Array(ids).size == 1
- error = "Couldn't find #{@klass.name} with #{primary_key}=#{ids}#{conditions}"
+ error = "Couldn't find #{@klass.name} with '#{primary_key}'=#{ids}#{conditions}"
else
- error = "Couldn't find all #{@klass.name.pluralize} with IDs "
+ error = "Couldn't find all #{@klass.name.pluralize} with '#{primary_key}': "
error << "(#{ids.join(", ")})#{conditions} (found #{result_size} results, but was looking for #{expected_size})"
end