aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2017-05-24 13:16:11 +0930
committerGitHub <noreply@github.com>2017-05-24 13:16:11 +0930
commita55c48a9dbdecd7a2a1b0c009079cd9b16eaa354 (patch)
tree1abb1ced24e3e3c72edc46dec5464d2384b50840
parent28ed6a4f557ae50cdddf89c2606e76d239fc77c2 (diff)
parentd3c56fce94d93d42ba2a4a537075e7ba3cd0f9f3 (diff)
downloadrails-a55c48a9dbdecd7a2a1b0c009079cd9b16eaa354.tar.gz
rails-a55c48a9dbdecd7a2a1b0c009079cd9b16eaa354.tar.bz2
rails-a55c48a9dbdecd7a2a1b0c009079cd9b16eaa354.zip
Merge pull request #29182 from kamipo/remove_unused_left_joins_values_generation
Remove unused `left_joins_values` generation
-rw-r--r--activerecord/lib/active_record/relation.rb2
-rw-r--r--activerecord/test/cases/relation/mutation_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 333ad16e11..2d5be32266 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -2,7 +2,7 @@ module ActiveRecord
# = Active Record \Relation
class Relation
MULTI_VALUE_METHODS = [:includes, :eager_load, :preload, :select, :group,
- :order, :joins, :left_joins, :left_outer_joins, :references,
+ :order, :joins, :left_outer_joins, :references,
:extending, :unscope]
SINGLE_VALUE_METHODS = [:limit, :offset, :lock, :readonly, :reordering,
diff --git a/activerecord/test/cases/relation/mutation_test.rb b/activerecord/test/cases/relation/mutation_test.rb
index 11ef0d8743..dea787c07f 100644
--- a/activerecord/test/cases/relation/mutation_test.rb
+++ b/activerecord/test/cases/relation/mutation_test.rb
@@ -36,7 +36,7 @@ module ActiveRecord
@relation ||= Relation.new FakeKlass.new("posts"), Post.arel_table, Post.predicate_builder
end
- (Relation::MULTI_VALUE_METHODS - [:references, :extending, :order, :unscope, :select, :left_joins]).each do |method|
+ (Relation::MULTI_VALUE_METHODS - [:references, :extending, :order, :unscope, :select]).each do |method|
test "##{method}!" do
assert relation.public_send("#{method}!", :foo).equal?(relation)
assert_equal [:foo], relation.public_send("#{method}_values")