aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRyan Wallace <rywall@gmail.com>2013-09-06 15:16:39 -0700
committerRyan Wallace <rywall@gmail.com>2013-09-08 14:00:19 -0700
commit87a84d3263c8712f85e70c45803203fa54658a9e (patch)
tree7453b761441cd4479e58794effc342bdb76f6ff4 /activerecord/lib
parent6a91a3307ff6556225ab8717617074cea20222e0 (diff)
downloadrails-87a84d3263c8712f85e70c45803203fa54658a9e.tar.gz
rails-87a84d3263c8712f85e70c45803203fa54658a9e.tar.bz2
rails-87a84d3263c8712f85e70c45803203fa54658a9e.zip
Allow Relation#from to accept other relations with bind values.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/relation/query_methods.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 1c6ea94c0b..9916c597ee 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -915,6 +915,7 @@ module ActiveRecord
case opts
when Relation
name ||= 'subquery'
+ self.bind_values = opts.bind_values + self.bind_values
opts.arel.as(name.to_s)
else
opts