aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2017-04-15 12:54:47 +0100
committerGitHub <noreply@github.com>2017-04-15 12:54:47 +0100
commit348413eaa3cbfec2efd89d01b5449d55ff5f152a (patch)
tree966a4b2f0cc38ded1b507382e9aabb873b8e6103 /activerecord/lib/active_record
parent258f629a267a49532e668ef0756a89ea33a4b15b (diff)
parent5c8b3391a3d18ff3c3dd822d1531b074afa40675 (diff)
downloadrails-348413eaa3cbfec2efd89d01b5449d55ff5f152a.tar.gz
rails-348413eaa3cbfec2efd89d01b5449d55ff5f152a.tar.bz2
rails-348413eaa3cbfec2efd89d01b5449d55ff5f152a.zip
Merge pull request #28767 from kamipo/rename_to_association_query_value
Rename `association_query_handler.rb` to `association_query_value.rb`
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/relation/predicate_builder.rb17
-rw-r--r--activerecord/lib/active_record/relation/predicate_builder/association_query_value.rb (renamed from activerecord/lib/active_record/relation/predicate_builder/association_query_handler.rb)0
-rw-r--r--activerecord/lib/active_record/relation/predicate_builder/polymorphic_array_value.rb (renamed from activerecord/lib/active_record/relation/predicate_builder/polymorphic_array_handler.rb)0
3 files changed, 9 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb
index 133b3d837c..183fe91c05 100644
--- a/activerecord/lib/active_record/relation/predicate_builder.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder.rb
@@ -1,13 +1,14 @@
+require "active_record/relation/predicate_builder/array_handler"
+require "active_record/relation/predicate_builder/base_handler"
+require "active_record/relation/predicate_builder/basic_object_handler"
+require "active_record/relation/predicate_builder/range_handler"
+require "active_record/relation/predicate_builder/relation_handler"
+
+require "active_record/relation/predicate_builder/association_query_value"
+require "active_record/relation/predicate_builder/polymorphic_array_value"
+
module ActiveRecord
class PredicateBuilder # :nodoc:
- require "active_record/relation/predicate_builder/array_handler"
- require "active_record/relation/predicate_builder/association_query_handler"
- require "active_record/relation/predicate_builder/base_handler"
- require "active_record/relation/predicate_builder/basic_object_handler"
- require "active_record/relation/predicate_builder/polymorphic_array_handler"
- require "active_record/relation/predicate_builder/range_handler"
- require "active_record/relation/predicate_builder/relation_handler"
-
delegate :resolve_column_aliases, to: :table
def initialize(table)
diff --git a/activerecord/lib/active_record/relation/predicate_builder/association_query_handler.rb b/activerecord/lib/active_record/relation/predicate_builder/association_query_value.rb
index 2fe0f81cab..2fe0f81cab 100644
--- a/activerecord/lib/active_record/relation/predicate_builder/association_query_handler.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder/association_query_value.rb
diff --git a/activerecord/lib/active_record/relation/predicate_builder/polymorphic_array_handler.rb b/activerecord/lib/active_record/relation/predicate_builder/polymorphic_array_value.rb
index 9bb2f8c8dc..9bb2f8c8dc 100644
--- a/activerecord/lib/active_record/relation/predicate_builder/polymorphic_array_handler.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder/polymorphic_array_value.rb