Merge pull request #25999 from kamipo/remove_sanitize_conditions

Remove `sanitize_conditions` and use `sanitize_sql` instead of `sanitize_conditions`

3 files changed, 8 insertions, 4 deletions

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 6b996fd6bd..38d8660721 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Deprecate `sanitize_conditions`. Use `sanitize_sql` instead.
+
+    *Ryuta Kamizono*
+
 *   Doing count on relations that contain LEFT OUTER JOIN Arel node no longer
     force a DISTINCT. This solves issues when using count after a left_joins.
 
diff --git a/activerecord/lib/active_record/querying.rb b/activerecord/lib/active_record/querying.rb
index 7b4b8c60f8..dd7d650207 100644
--- a/activerecord/lib/active_record/querying.rb
+++ b/activerecord/lib/active_record/querying.rb
@@ -62,8 +62,7 @@ module ActiveRecord
     #
     # * +sql+ - An SQL statement which should return a count query from the database, see the example above.
     def count_by_sql(sql)
-      sql = sanitize_conditions(sql)
-      connection.select_value(sql, "#{name} Count").to_i
+      connection.select_value(sanitize_sql(sql), "#{name} Count").to_i
     end
   end
 end
diff --git a/activerecord/lib/active_record/sanitization.rb b/activerecord/lib/active_record/sanitization.rb
index c40e98715e..7f596120eb 100644
--- a/activerecord/lib/active_record/sanitization.rb
+++ b/activerecord/lib/active_record/sanitization.rb
@@ -29,8 +29,9 @@ module ActiveRecord
           else        condition
           end
         end
-        alias_method :sanitize_sql, :sanitize_sql_for_conditions
-        alias_method :sanitize_conditions, :sanitize_sql
+        alias :sanitize_sql :sanitize_sql_for_conditions
+        alias :sanitize_conditions :sanitize_sql
+        deprecate sanitize_conditions: :sanitize_sql
 
       # Accepts an array, hash, or string of SQL conditions and sanitizes
       # them into a valid SQL fragment for a SET clause.