diff options
| author | Melanie Gilman <melanie@thoughtbot.com> | 2014-12-02 11:04:38 -0500 |
|---|---|---|
| committer | Melanie Gilman <melanie@thoughtbot.com> | 2014-12-02 11:04:38 -0500 |
| commit | 502bc87fbaeb2917e3d7eb3d26badff887073c4e (patch) | |
| tree | 34fdf78fc795e7b97b90301683d45ee2d2424b3d /activerecord/lib/active_record/relation/query_methods.rb | |
| parent | bc8cc56a2ae0b73276782d66b7dceba1ecd294a2 (diff) | |
| download | rails-502bc87fbaeb2917e3d7eb3d26badff887073c4e.tar.gz rails-502bc87fbaeb2917e3d7eb3d26badff887073c4e.tar.bz2 rails-502bc87fbaeb2917e3d7eb3d26badff887073c4e.zip | |
Refactor `PredicateBuilder` from singleton to instance
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, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index d58af01339..f166b6d5db 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -947,7 +947,7 @@ module ActiveRecord when String, Array [@klass.send(:sanitize_sql, other.empty? ? opts : ([opts] + other))] when Hash - opts = PredicateBuilder.resolve_column_aliases(klass, opts) + opts = predicate_builder.resolve_column_aliases(opts) tmp_opts, bind_values = create_binds(opts) self.bind_values += bind_values @@ -955,7 +955,7 @@ module ActiveRecord attributes = @klass.send(:expand_hash_conditions_for_aggregates, tmp_opts) add_relations_to_bind_values(attributes) - PredicateBuilder.build_from_hash(klass, attributes, table) + predicate_builder.build_from_hash(attributes) else [opts] end |