1 files changed, 61 insertions, 61 deletions
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb
index 87a97803d5..df43b5c64b 100644
--- a/activerecord/lib/active_record/relation/merger.rb
+++ b/activerecord/lib/active_record/relation/merger.rb
@@ -83,85 +83,85 @@ module ActiveRecord
 
       private
 
-      def merge_preloads
-        return if other.preload_values.empty? && other.includes_values.empty?
-
-        if other.klass == relation.klass
-          relation.preload!(*other.preload_values) unless other.preload_values.empty?
-          relation.includes!(other.includes_values) unless other.includes_values.empty?
-        else
-          reflection = relation.klass.reflect_on_all_associations.find do |r|
-            r.class_name == other.klass.name
-          end || return
-
-          unless other.preload_values.empty?
-            relation.preload! reflection.name => other.preload_values
-          end
+        def merge_preloads
+          return if other.preload_values.empty? && other.includes_values.empty?
+
+          if other.klass == relation.klass
+            relation.preload!(*other.preload_values) unless other.preload_values.empty?
+            relation.includes!(other.includes_values) unless other.includes_values.empty?
+          else
+            reflection = relation.klass.reflect_on_all_associations.find do |r|
+              r.class_name == other.klass.name
+            end || return
 
-          unless other.includes_values.empty?
-            relation.includes! reflection.name => other.includes_values
+            unless other.preload_values.empty?
+              relation.preload! reflection.name => other.preload_values
+            end
+
+            unless other.includes_values.empty?
+              relation.includes! reflection.name => other.includes_values
+            end
           end
         end
-      end
 
-      def merge_joins
-        return if other.joins_values.blank?
+        def merge_joins
+          return if other.joins_values.blank?
 
-        if other.klass == relation.klass
-          relation.joins!(*other.joins_values)
-        else
-          joins_dependency, rest = other.joins_values.partition do |join|
-            case join
-            when Hash, Symbol, Array
-              true
-            else
-              false
+          if other.klass == relation.klass
+            relation.joins!(*other.joins_values)
+          else
+            joins_dependency, rest = other.joins_values.partition do |join|
+              case join
+              when Hash, Symbol, Array
+                true
+              else
+                false
+              end
             end
-          end
 
-          join_dependency = ActiveRecord::Associations::JoinDependency.new(other.klass,
-                                                                           joins_dependency,
-                                                                           [])
-          relation.joins! rest
+            join_dependency = ActiveRecord::Associations::JoinDependency.new(other.klass,
+                                                                             joins_dependency,
+                                                                             [])
+            relation.joins! rest
 
-          @relation = relation.joins join_dependency
+            @relation = relation.joins join_dependency
+          end
         end
-      end
 
-      def merge_multi_values
-        if other.reordering_value
-          # override any order specified in the original relation
-          relation.reorder! other.order_values
-        elsif other.order_values
-          # merge in order_values from relation
-          relation.order! other.order_values
+        def merge_multi_values
+          if other.reordering_value
+            # override any order specified in the original relation
+            relation.reorder! other.order_values
+          elsif other.order_values
+            # merge in order_values from relation
+            relation.order! other.order_values
+          end
+
+          relation.extend(*other.extending_values) unless other.extending_values.blank?
         end
 
-        relation.extend(*other.extending_values) unless other.extending_values.blank?
-      end
+        def merge_single_values
+          if relation.from_clause.empty?
+            relation.from_clause = other.from_clause
+          end
+          relation.lock_value ||= other.lock_value
 
-      def merge_single_values
-        if relation.from_clause.empty?
-          relation.from_clause = other.from_clause
+          unless other.create_with_value.blank?
+            relation.create_with_value = (relation.create_with_value || {}).merge(other.create_with_value)
+          end
         end
-        relation.lock_value ||= other.lock_value
 
-        unless other.create_with_value.blank?
-          relation.create_with_value = (relation.create_with_value || {}).merge(other.create_with_value)
+        CLAUSE_METHOD_NAMES = CLAUSE_METHODS.map do |name|
+          ["#{name}_clause", "#{name}_clause="]
         end
-      end
-
-      CLAUSE_METHOD_NAMES = CLAUSE_METHODS.map do |name|
-        ["#{name}_clause", "#{name}_clause="]
-      end
 
-      def merge_clauses
-        CLAUSE_METHOD_NAMES.each do |(reader, writer)|
-          clause = relation.send(reader)
-          other_clause = other.send(reader)
-          relation.send(writer, clause.merge(other_clause))
+        def merge_clauses
+          CLAUSE_METHOD_NAMES.each do |(reader, writer)|
+            clause = relation.send(reader)
+            other_clause = other.send(reader)
+            relation.send(writer, clause.merge(other_clause))
+          end
         end
-      end
     end
   end
 end