From 424b2d8594121456ed347957714a20c62d09a5cd Mon Sep 17 00:00:00 2001
From: Dmitry Polushkin <dmitry.polushkin@gmail.com>
Date: Sun, 9 Feb 2014 12:04:26 +0000
Subject: move alias method `sanitize_conditions` to a correct place
---
activerecord/lib/active_record/sanitization.rb | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'activerecord')
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
--
cgit v1.2.3
From ec43584431f61ad56f335033b650a906f44fbf40 Mon Sep 17 00:00:00 2001
From: Dmitry Polushkin <dmitry.polushkin@gmail.com>
Date: Sun, 9 Feb 2014 12:05:42 +0000
Subject: add activerecord test coverage for `sanitize_sql_array`
check it is handles empty statement
---
activerecord/test/cases/sanitize_test.rb | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'activerecord')
diff --git a/activerecord/test/cases/sanitize_test.rb b/activerecord/test/cases/sanitize_test.rb
index 766b2ff2ef..954eab8022 100644
--- a/activerecord/test/cases/sanitize_test.rb
+++ b/activerecord/test/cases/sanitize_test.rb
@@ -46,4 +46,9 @@ class SanitizeTest < ActiveRecord::TestCase
select_author_sql = Post.send(:sanitize_sql_array, ['id in (:post_ids)', post_ids: david_posts])
assert_match(sub_query_pattern, select_author_sql, 'should sanitize `Relation` as subquery for named bind variables')
end
+
+ def test_sanitize_sql_array_handles_empty_statement
+ select_author_sql = Post.send(:sanitize_sql_array, [''])
+ assert_equal('', select_author_sql)
+ end
end
--
cgit v1.2.3