aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation.rb
diff options
context:
space:
mode:
authorSean Griffin <sean@thoughtbot.com>2015-01-26 16:20:58 -0700
committerSean Griffin <sean@thoughtbot.com>2015-01-26 16:20:58 -0700
commit8436e2c2bd91c1a57fb1273218a5428cc2c6b45a (patch)
tree6abad2641d03bea22570321a680b789e5202e368 /activerecord/lib/active_record/relation.rb
parent765a3123c840a24980aea69154cfea55967edd37 (diff)
downloadrails-8436e2c2bd91c1a57fb1273218a5428cc2c6b45a.tar.gz
rails-8436e2c2bd91c1a57fb1273218a5428cc2c6b45a.tar.bz2
rails-8436e2c2bd91c1a57fb1273218a5428cc2c6b45a.zip
Remove `Relation#bind_values=`
The last place that was assigning it was when `from` is called with a relation to use as a subquery. The implementation was actually completely broken, and would break if you called `from` more than once, or if you called it on a relation, which also had its own join clause, as the bind values would get completely scrambled. The simplest solution was to just move it into its own array, since creating a `FromClause` class for this would be overkill.
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
-rw-r--r--activerecord/lib/active_record/relation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 8789bdc9ca..d4cd63155c 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -5,7 +5,7 @@ module ActiveRecord
# = Active Record Relation
class Relation
MULTI_VALUE_METHODS = [:includes, :eager_load, :preload, :select, :group,
- :order, :joins, :references,
+ :order, :joins, :references, :from_bind,
:extending, :unscope]
SINGLE_VALUE_METHODS = [:limit, :offset, :lock, :readonly, :from, :reordering,