diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-30 00:05:47 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-30 00:05:47 -0300 |
| commit | 42f01e94e231763c10d2c1e0977c6ec5b5a7c78a (patch) | |
| tree | d9fe3e4e1be48354bfd063343c6be37af73d8834 /activerecord/lib | |
| parent | 43187f9cdc631f9ee8ec68025d81113acdf8eeef (diff) | |
| parent | 92c5a2244ec3e58fd5e70e7dd2d7882b80183c80 (diff) | |
| download | rails-42f01e94e231763c10d2c1e0977c6ec5b5a7c78a.tar.gz rails-42f01e94e231763c10d2c1e0977c6ec5b5a7c78a.tar.bz2 rails-42f01e94e231763c10d2c1e0977c6ec5b5a7c78a.zip | |
Merge branch 'revert-order-prepending'
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index d0c56ac3d0..49b632c4c7 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -299,7 +299,7 @@ module ActiveRecord arg } - self.order_values = args.concat self.order_values + self.order_values += args self end @@ -311,7 +311,7 @@ module ActiveRecord # # User.order('email DESC').reorder('id ASC').order('name ASC') # - # generates a query with 'ORDER BY name ASC, id ASC'. + # generates a query with 'ORDER BY id ASC, name ASC'. def reorder(*args) check_if_method_has_arguments!("reorder", args) spawn.reorder!(*args) |