aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-01-13 16:51:59 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2014-01-13 16:51:59 -0800
commitfd97f356357ef7053eb8615cd039efb5fa09cc44 (patch)
treebd7e56859ca5483614ba3691bcdeb6579fd8370f /activerecord/lib/active_record
parent91d3d00240a2f75c74664580398628207bb7d350 (diff)
downloadrails-fd97f356357ef7053eb8615cd039efb5fa09cc44.tar.gz
rails-fd97f356357ef7053eb8615cd039efb5fa09cc44.tar.bz2
rails-fd97f356357ef7053eb8615cd039efb5fa09cc44.zip
fixing column alias resolution
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/relation/query_methods.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 64fbd67a9c..309e8a564d 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -922,8 +922,8 @@ module ActiveRecord
[@klass.send(:sanitize_sql, other.empty? ? opts : ([opts] + other))]
when Hash
- temp_opts = opts.dup
opts = PredicateBuilder.resolve_column_aliases(klass, opts)
+ temp_opts = opts.dup
attributes = @klass.send(:expand_hash_conditions_for_aggregates, opts)
create_binds(temp_opts)