diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-02-09 16:51:59 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-02-09 16:51:59 -0200 |
commit | e4911e9162e65ba995009c973462129d00dce1a6 (patch) | |
tree | 3d4c3522d0c9804bcf69f6cac89854ca8402bdcb /activerecord | |
parent | 462d7cb3148e95c9a793d33fd882a99f0d9c57c2 (diff) | |
parent | 8acd58f23cac478c2f5f8a51a9b591a98773baec (diff) | |
download | rails-e4911e9162e65ba995009c973462129d00dce1a6.tar.gz rails-e4911e9162e65ba995009c973462129d00dce1a6.tar.bz2 rails-e4911e9162e65ba995009c973462129d00dce1a6.zip |
Merge pull request #13997 from dmitry/test_coverage_improvement
Test coverage improvement
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/sanitization.rb | 3 | ||||
-rw-r--r-- | activerecord/test/cases/sanitize_test.rb | 5 |
2 files changed, 6 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 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 |