diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-17 11:41:31 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-17 11:41:31 -0800 |
| commit | 3281d5a1708f50208d1c51a3b2f404de0d9e0941 (patch) | |
| tree | 017a55ff4af561d72a1595035a362366bdd7b1e7 | |
| parent | d091c8fd34aabcc9da23f93793d2e5241a4584fa (diff) | |
| parent | fe4758ae3232b0f121968c3a2cb415cc5747fd7e (diff) | |
| download | rails-3281d5a1708f50208d1c51a3b2f404de0d9e0941.tar.gz rails-3281d5a1708f50208d1c51a3b2f404de0d9e0941.tar.bz2 rails-3281d5a1708f50208d1c51a3b2f404de0d9e0941.zip | |
Merge branch 'adequaterecord' of github.com:rails/rails into adequaterecord
* 'adequaterecord' of github.com:rails/rails:
Remove outdated comment.
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 226f1b8176..6cf57b679d 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -924,7 +924,6 @@ module ActiveRecord def build_where(opts, other = []) case opts when String, Array - #TODO: Remove duplication with: /activerecord/lib/active_record/sanitization.rb:113 [@klass.send(:sanitize_sql, other.empty? ? opts : ([opts] + other))] when Hash opts = PredicateBuilder.resolve_column_aliases(klass, opts) |