0
@@ -1297,6 +1297,20 @@ module ActiveRecord #:nodoc:
0
         store_full_sti_class ? name : name.demodulize
0
       end
0
 
0
+      # Merges conditions so that the result is a valid +condition+
0
+      def merge_conditions(*conditions)
0
+        segments = []
0
+
0
+        conditions.each do |condition|
0
+          unless condition.blank?
0
+            sql = sanitize_sql(condition)
0
+            segments << sql unless sql.blank?
0
+          end
0
+        end
0
+
0
+        "(#{segments.join(') AND (')})" unless segments.empty?
0
+      end
0
+
0
       private
0
         def find_initial(options)
0
           options.update(:limit => 1)
0
@@ -1484,20 +1498,6 @@ module ActiveRecord #:nodoc:
0
          (safe_to_array(first) + safe_to_array(second)).uniq
0
         end
0
 
0
-        # Merges conditions so that the result is a valid +condition+
0
-        def merge_conditions(*conditions)
0
-          segments = []
0
-
0
-          conditions.each do |condition|
0
-            unless condition.blank?
0
-              sql = sanitize_sql(condition)
0
-              segments << sql unless sql.blank?
0
-            end
0
-          end
0
-
0
-          "(#{segments.join(') AND (')})" unless segments.empty?
0
-        end
0
-
0
         # Object#to_a is deprecated, though it does have the desired behavior
0
         def safe_to_array(o)
0
           case o