aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorDmitry Polushkin <dmitry.polushkin@gmail.com>2014-02-09 12:04:26 +0000
committerDmitry Polushkin <dmitry.polushkin@gmail.com>2014-02-09 12:04:26 +0000
commit424b2d8594121456ed347957714a20c62d09a5cd (patch)
treee6cdf41f438d210de8f95f83e89b685978f3f505 /activerecord
parent6ac2655ecaec90310aa32395130e6b7c89863941 (diff)
downloadrails-424b2d8594121456ed347957714a20c62d09a5cd.tar.gz
rails-424b2d8594121456ed347957714a20c62d09a5cd.tar.bz2
rails-424b2d8594121456ed347957714a20c62d09a5cd.zip
move alias method `sanitize_conditions` to a correct place
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/sanitization.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/sanitization.rb b/activerecord/lib/active_record/sanitization.rb
index dacaec26b7..5a71c13d91 100644
--- a/activerecord/lib/active_record/sanitization.rb
+++ b/activerecord/lib/active_record/sanitization.rb
@@ -29,6 +29,7 @@ module ActiveRecord
end
end
alias_method :sanitize_sql, :sanitize_sql_for_conditions
+ alias_method :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.
@@ -122,8 +123,6 @@ module ActiveRecord
end
end
- alias_method :sanitize_conditions, :sanitize_sql
-
def replace_bind_variables(statement, values) #:nodoc:
raise_if_bind_arity_mismatch(statement, statement.count('?'), values.size)
bound = values.dup