diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-08-18 22:57:27 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-18 22:57:27 -0300 |
| commit | c2af081c4f566560e3caab0a8c10893093b9e826 (patch) | |
| tree | effd1e5b04ea3234fd3089dd29456a54ac0a1155 /activerecord/lib/active_record/querying.rb | |
| parent | 40516d01f1511cb7252556111dbb1b465b65bd12 (diff) | |
| parent | 6eaf5c925362f0d1e7bf03a9f82c33569969d9a1 (diff) | |
| download | rails-c2af081c4f566560e3caab0a8c10893093b9e826.tar.gz rails-c2af081c4f566560e3caab0a8c10893093b9e826.tar.bz2 rails-c2af081c4f566560e3caab0a8c10893093b9e826.zip | |
Merge pull request #25999 from kamipo/remove_sanitize_conditions
Remove `sanitize_conditions` and use `sanitize_sql` instead of `sanitize_conditions`
Diffstat (limited to 'activerecord/lib/active_record/querying.rb')
| -rw-r--r-- | activerecord/lib/active_record/querying.rb | 3 |
1 files changed, 1 insertions, 2 deletions
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 |