aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-04-11 15:49:37 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-04-11 15:50:05 -0700
commitb53ffb35e085362bb2690577ae123a1f4872c12a (patch)
tree5d07496e2be3055f4f5b8a752208f22dbaa393b6
parentd1575ae1b9658c91145d6a46ec2a144a5a089207 (diff)
downloadrails-b53ffb35e085362bb2690577ae123a1f4872c12a.tar.gz
rails-b53ffb35e085362bb2690577ae123a1f4872c12a.tar.bz2
rails-b53ffb35e085362bb2690577ae123a1f4872c12a.zip
stop using deprecated methods in arel
-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 7fe6fe0ed0..673e47942b 100644
--- a/activerecord/lib/active_record/relation/finder_methods.rb
+++ b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -352,8 +352,8 @@ module ActiveRecord
if result.size == expected_size
result
else
- conditions = arel.wheres.map { |x| x.value }.join(', ')
- conditions = " [WHERE #{conditions}]" if conditions.present?
+ conditions = arel.where_sql
+ conditions = " [#{conditions}]" if conditions
error = "Couldn't find all #{@klass.name.pluralize} with IDs "
error << "(#{ids.join(", ")})#{conditions} (found #{result.size} results, but was looking for #{expected_size})"