diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-07-15 16:16:18 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-07-15 16:16:18 -0700 |
| commit | d345ed40b5783ec2cb43f4434872ea5b2d57d203 (patch) | |
| tree | 2e8920c98c6c131461d2c87888b33f298fc898ea /activerecord/lib | |
| parent | a618e9e9ddf4b1900c9288625eaa2a9b444dc0c5 (diff) | |
| download | rails-d345ed40b5783ec2cb43f4434872ea5b2d57d203.tar.gz rails-d345ed40b5783ec2cb43f4434872ea5b2d57d203.tar.bz2 rails-d345ed40b5783ec2cb43f4434872ea5b2d57d203.zip | |
use arel rather than slapping together SQL strings
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index a27b6abe2e..f146c1fdb2 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -285,8 +285,10 @@ module ActiveRecord references!(references) if references.any? # if a symbol is given we prepend the quoted table name - args = args.map { |arg| - arg.is_a?(Symbol) ? "#{quoted_table_name}.#{arg} ASC" : arg + args = args.map! { |arg| + arg.is_a?(Symbol) ? + Arel::Nodes::Ascending.new(klass.arel_table[arg]) : + arg } self.order_values = args + self.order_values |