diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-03-30 21:04:33 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-03-30 21:04:33 -0500 |
| commit | 56a5da89dbcdd6d73f26f5c1be6221b684574b2b (patch) | |
| tree | 577fbc16d37ed54bbda1a2a7477894caa6a7bfff /activerecord/lib/active_record/relation/batches.rb | |
| parent | 5df076ad0965dc684afff8a019fd9f92a53ada76 (diff) | |
| parent | 58c3ec1b7b7ee073edf9c245de5d06426be60a25 (diff) | |
| download | rails-56a5da89dbcdd6d73f26f5c1be6221b684574b2b.tar.gz rails-56a5da89dbcdd6d73f26f5c1be6221b684574b2b.tar.bz2 rails-56a5da89dbcdd6d73f26f5c1be6221b684574b2b.zip | |
Merge branch 'master' into sprockets
Conflicts:
railties/lib/rails/application/configuration.rb
Diffstat (limited to 'activerecord/lib/active_record/relation/batches.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/batches.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/batches.rb b/activerecord/lib/active_record/relation/batches.rb index bf5a60f458..d52b84179f 100644 --- a/activerecord/lib/active_record/relation/batches.rb +++ b/activerecord/lib/active_record/relation/batches.rb @@ -83,7 +83,7 @@ module ActiveRecord private def batch_order - "#{table_name}.#{primary_key} ASC" + "#{quoted_table_name}.#{quoted_primary_key} ASC" end end end |