Merge branch 'master' into fix_26964

1 files changed, 13 insertions, 13 deletions

diff --git a/activerecord/lib/active_record/sanitization.rb b/activerecord/lib/active_record/sanitization.rb
index 3d52dc44cf..647834b12e 100644
--- a/activerecord/lib/active_record/sanitization.rb
+++ b/activerecord/lib/active_record/sanitization.rb
@@ -4,7 +4,7 @@ module ActiveRecord
     extend ActiveSupport::Concern
 
     module ClassMethods
-      protected
+      private
 
         # Accepts an array or string of SQL conditions and sanitizes
         # them into a valid SQL fragment for a WHERE clause.
@@ -20,7 +20,7 @@ module ActiveRecord
         #
         #   sanitize_sql_for_conditions("name='foo''bar' and group_id='4'")
         #   # => "name='foo''bar' and group_id='4'"
-        def sanitize_sql_for_conditions(condition)
+        def sanitize_sql_for_conditions(condition) # :doc:
           return nil if condition.blank?
 
           case condition
@@ -46,7 +46,7 @@ module ActiveRecord
         #
         #   sanitize_sql_for_assignment("name=NULL and group_id='4'")
         #   # => "name=NULL and group_id='4'"
-        def sanitize_sql_for_assignment(assignments, default_table_name = self.table_name)
+        def sanitize_sql_for_assignment(assignments, default_table_name = self.table_name) # :doc:
           case assignments
           when Array; sanitize_sql_array(assignments)
           when Hash;  sanitize_sql_hash_for_assignment(assignments, default_table_name)
@@ -62,7 +62,7 @@ module ActiveRecord
         #
         #   sanitize_sql_for_order("id ASC")
         #   # => "id ASC"
-        def sanitize_sql_for_order(condition)
+        def sanitize_sql_for_order(condition) # :doc:
           if condition.is_a?(Array) && condition.first.to_s.include?("?")
             sanitize_sql_array(condition)
           else
@@ -85,7 +85,7 @@ module ActiveRecord
         #
         #   { address: Address.new("813 abc st.", "chicago") }
         #   # => { address_street: "813 abc st.", address_city: "chicago" }
-        def expand_hash_conditions_for_aggregates(attrs)
+        def expand_hash_conditions_for_aggregates(attrs) # :doc:
           expanded_attrs = {}
           attrs.each do |attr, value|
             if aggregation = reflect_on_aggregation(attr.to_sym)
@@ -108,7 +108,7 @@ module ActiveRecord
         #
         #   sanitize_sql_hash_for_assignment({ status: nil, group_id: 1 }, "posts")
         #   # => "`posts`.`status` = NULL, `posts`.`group_id` = 1"
-        def sanitize_sql_hash_for_assignment(attrs, table)
+        def sanitize_sql_hash_for_assignment(attrs, table) # :doc:
           c = connection
           attrs.map do |attr, value|
             value = type_for_attribute(attr.to_s).serialize(value)
@@ -130,7 +130,7 @@ module ActiveRecord
         #
         #   sanitize_sql_like("snake_cased_string", "!")
         #   # => "snake!_cased!_string"
-        def sanitize_sql_like(string, escape_character = "\\")
+        def sanitize_sql_like(string, escape_character = "\\") # :doc:
           pattern = Regexp.union(escape_character, "%", "_")
           string.gsub(pattern) { |x| [escape_character, x].join }
         end
@@ -146,7 +146,7 @@ module ActiveRecord
         #
         #   sanitize_sql_array(["name='%s' and group_id='%s'", "foo'bar", 4])
         #   # => "name='foo''bar' and group_id='4'"
-        def sanitize_sql_array(ary)
+        def sanitize_sql_array(ary) # :doc:
           statement, *values = ary
           if values.first.is_a?(Hash) && /:\w+/.match?(statement)
             replace_named_bind_variables(statement, values.first)
@@ -159,7 +159,7 @@ module ActiveRecord
           end
         end
 
-        def replace_bind_variables(statement, values) # :nodoc:
+        def replace_bind_variables(statement, values)
           raise_if_bind_arity_mismatch(statement, statement.count("?"), values.size)
           bound = values.dup
           c = connection
@@ -168,7 +168,7 @@ module ActiveRecord
           end
         end
 
-        def replace_bind_variable(value, c = connection) # :nodoc:
+        def replace_bind_variable(value, c = connection)
           if ActiveRecord::Relation === value
             value.to_sql
           else
@@ -176,7 +176,7 @@ module ActiveRecord
           end
         end
 
-        def replace_named_bind_variables(statement, bind_vars) # :nodoc:
+        def replace_named_bind_variables(statement, bind_vars)
           statement.gsub(/(:?):([a-zA-Z]\w*)/) do |match|
             if $1 == ":" # skip postgresql casts
               match # return the whole match
@@ -188,7 +188,7 @@ module ActiveRecord
           end
         end
 
-        def quote_bound_value(value, c = connection) # :nodoc:
+        def quote_bound_value(value, c = connection)
           if value.respond_to?(:map) && !value.acts_like?(:string)
             if value.respond_to?(:empty?) && value.empty?
               c.quote(nil)
@@ -200,7 +200,7 @@ module ActiveRecord
           end
         end
 
-        def raise_if_bind_arity_mismatch(statement, expected, provided) # :nodoc:
+        def raise_if_bind_arity_mismatch(statement, expected, provided)
           unless expected == provided
             raise PreparedStatementInvalid, "wrong number of bind variables (#{provided} for #{expected}) in: #{statement}"
           end