aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2015-09-21 11:14:32 -0600
committerSean Griffin <sean@seantheprogrammer.com>2015-09-21 11:14:32 -0600
commit9cc324a3f1348430e5b6db58bbddab5090c708c8 (patch)
treed53057f5003153206a383b984f5631c5a23c1c9b /activerecord/lib/active_record/relation
parentdac7d0d046bb07a061cbaf6bb526ff96bf73bc1d (diff)
downloadrails-9cc324a3f1348430e5b6db58bbddab5090c708c8.tar.gz
rails-9cc324a3f1348430e5b6db58bbddab5090c708c8.tar.bz2
rails-9cc324a3f1348430e5b6db58bbddab5090c708c8.zip
Ensure aliased attributes passed to `select` are quoted if using `from`
Fixes #21488 [Sean Griffin & johanlunds]
Diffstat (limited to 'activerecord/lib/active_record/relation')
-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 e25b889851..038280509d 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -250,7 +250,7 @@ module ActiveRecord
def _select!(*fields) # :nodoc:
fields.flatten!
fields.map! do |field|
- klass.attribute_alias?(field) ? klass.attribute_alias(field) : field
+ klass.attribute_alias?(field) ? klass.attribute_alias(field).to_sym : field
end
self.select_values += fields
self