diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-02-17 13:42:42 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-02-17 13:42:42 -0800 |
| commit | 23ce2f61b5a7699af8213bf1b5d581da194ab8f4 (patch) | |
| tree | b2adcb398f6b5171e15fd681fd23d5c94ca1cdcf /activerecord/lib/active_record/relation/query_methods.rb | |
| parent | fe42effb11a97cf19777d7b0dba7e1e2dfd3316c (diff) | |
| parent | c18e7ab44706735d9b1274760bdc62ad5bef7757 (diff) | |
| download | rails-23ce2f61b5a7699af8213bf1b5d581da194ab8f4.tar.gz rails-23ce2f61b5a7699af8213bf1b5d581da194ab8f4.tar.bz2 rails-23ce2f61b5a7699af8213bf1b5d581da194ab8f4.zip | |
Merge branch 'master' into adequaterecord
* master:
Revert "Merge pull request #13344 from ccutrer/fix-from-default-select"
No need to use symbols
Don't skip tests if they are not broken. Just don't define they
Fix typo [ci skip]
Resolve encoding issues with arrays of hstore (bug 11135).
Fix coffeescript sample [ci skip]
Diffstat (limited to 'activerecord/lib/active_record/relation/query_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 7d2b427289..d722a32f45 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -240,7 +240,7 @@ module ActiveRecord def select!(*fields) # :nodoc: fields.flatten! fields.map! do |field| - klass.attribute_alias?(field) ? klass.attribute_alias(field).to_sym : field + klass.attribute_alias?(field) ? klass.attribute_alias(field) : field end self.select_values += fields self @@ -1030,8 +1030,6 @@ module ActiveRecord columns_hash.key?(field.to_s) ? arel_table[field] : field end arel.project(*expanded_select) - elsif from_value - arel.project(Arel.star) else arel.project(@klass.arel_table[Arel.star]) end @@ -1087,11 +1085,11 @@ module ActiveRecord order_args.map! do |arg| case arg when Symbol - arg = klass.attribute_alias(arg).to_sym if klass.attribute_alias?(arg) + arg = klass.attribute_alias(arg) if klass.attribute_alias?(arg) table[arg].asc when Hash arg.map { |field, dir| - field = klass.attribute_alias(field).to_sym if klass.attribute_alias?(field) + field = klass.attribute_alias(field) if klass.attribute_alias?(field) table[field].send(dir) } else |