aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-04-15 18:17:10 +0900
committerRyuta Kamizono <kamipo@gmail.com>2017-04-15 18:17:10 +0900
commit5c8b3391a3d18ff3c3dd822d1531b074afa40675 (patch)
tree1e3dac2750aa4c2e1a334938e1c59d193f98ec3b
parent2e07392c7c6421998ef2199fe8e6d83e4cbb09bb (diff)
downloadrails-5c8b3391a3d18ff3c3dd822d1531b074afa40675.tar.gz
rails-5c8b3391a3d18ff3c3dd822d1531b074afa40675.tar.bz2
rails-5c8b3391a3d18ff3c3dd822d1531b074afa40675.zip
Rename `association_query_handler.rb` to `association_query_value.rb`
Since `AssociationQueryHandler` and `PolymorphicArrayHandler` has removed in #28715, only exists `AssociationQueryValue` and `PolymorphicArrayValue` in these files.
-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