aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-04-11 16:14:51 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-04-11 16:14:51 -0700
commit85f3a57a57b3c6d105e35936bf3ee972dc652902 (patch)
treebff7790eaeb0c336d24ebca1af93e9b3a9e33788 /activerecord/lib
parentdbc8c0ee36ddda7c27a375c78bbdb989fd30c298 (diff)
downloadrails-85f3a57a57b3c6d105e35936bf3ee972dc652902.tar.gz
rails-85f3a57a57b3c6d105e35936bf3ee972dc652902.tar.bz2
rails-85f3a57a57b3c6d105e35936bf3ee972dc652902.zip
propogate bind values collected in arel to SQL generation
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/relation.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index a0e84201be..5b635ca7c1 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -326,7 +326,8 @@ module ActiveRecord
stmt.wheres = arel.constraints
end
- @klass.connection.update stmt, 'SQL', bind_values
+ bvs = bind_values + arel.bind_values
+ @klass.connection.update stmt, 'SQL', bvs
end
# Updates an object (or multiple objects) and saves it to the database, if validations pass.