Merge pull request #328 from activerecord-hackery/order_sequence_in_rails40

Ordering sequence is now correct when chaining multiple order methods in Rails 4.0 stable branch

Author: bigxiang

CHANGELOG.md

@@ -7,6 +7,7 @@
 * Fix NoMethodError when calling unscope method above Rails 4. By @estum
 * Fix error when including HABTM or HMT associations without eager loading.
   Fixes #326.
+* Ordering sequence is now correct when chaining multiple order methods. Fixes #276.
 
 ## 1.2.1 (2014-07-18)
 

lib/squeel/adapters/active_record/4.0/relation_extensions.rb

@@ -160,10 +160,12 @@ def order!(*args)
 
           # 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
+            arg.is_a?(Symbol) ?
+              Arel::Nodes::Ascending.new(klass.arel_table[arg]) :
+              arg
           }
 
-          self.order_values = args + self.order_values
+          self.order_values += args
           self
         end
 

spec/squeel/adapters/active_record/relation_extensions_spec.rb

@@ -776,7 +776,6 @@ module ActiveRecord
               if MYSQL_ENV
                 User.first.groups.to_sql.should match /#{Q}memberships#{Q}.#{Q}active#{Q} = 1/
               else
-                puts User.first.groups.to_sql
                 User.first.groups.to_sql.should match /#{Q}memberships#{Q}.#{Q}active#{Q} = 't'/
               end
 
@@ -836,6 +835,11 @@ module ActiveRecord
             relation.to_sql.should match /ORDER BY #{Q}people#{Q}.#{Q}id#{Q} ASC/
           end
 
+          it 'orders chain in correct sequence' do
+            relation = Article.order {id.asc}.order {title.desc}
+            relation.to_sql.should match /#{Q}articles#{Q}.#{Q}id#{Q} ASC, #{Q}articles#{Q}.#{Q}title#{Q} DESC/
+          end
+
         end
 
         describe '#reorder' do