diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-14 11:49:44 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-14 11:49:44 -0800 |
| commit | 6392cd91b05814d5f7735d458c51cd11c6c4367d (patch) | |
| tree | 9eeda6271ec3c5f00d93b55f8722d4ff3e1826b5 /activerecord/lib/active_record/relation/query_methods.rb | |
| parent | 09035e622f9876cddc558ea065929cb862ca0f13 (diff) | |
| download | rails-6392cd91b05814d5f7735d458c51cd11c6c4367d.tar.gz rails-6392cd91b05814d5f7735d458c51cd11c6c4367d.tar.bz2 rails-6392cd91b05814d5f7735d458c51cd11c6c4367d.zip | |
we should not be copying these. fixes test_find_all_using_where_with_relation_with_bound_values
Diffstat (limited to 'activerecord/lib/active_record/relation/query_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 309e8a564d..3e04ff2a80 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -916,10 +916,6 @@ module ActiveRecord #TODO: Remove duplication with: /activerecord/lib/active_record/sanitization.rb:113 values = Hash === other.first ? other.first.values : other - values.grep(ActiveRecord::Relation) do |rel| - self.bind_values += rel.bind_values - end - [@klass.send(:sanitize_sql, other.empty? ? opts : ([opts] + other))] when Hash opts = PredicateBuilder.resolve_column_aliases(klass, opts) |