diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-04-24 12:34:33 -0500 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-04-24 14:29:18 -0500 |
| commit | 1b7aa62b184c4410c99208f71b59bbac5c5f03be (patch) | |
| tree | 6016586cae2b35b8c904d7d23328657a110ad266 /activerecord/lib/active_record/associations/preloader | |
| parent | 10ed70185a664b34c1177c24b7ab06cd74502183 (diff) | |
| download | rails-1b7aa62b184c4410c99208f71b59bbac5c5f03be.tar.gz rails-1b7aa62b184c4410c99208f71b59bbac5c5f03be.tar.bz2 rails-1b7aa62b184c4410c99208f71b59bbac5c5f03be.zip | |
reset `@arel` when modifying a Relation in place.
/cc @tenderlove
Diffstat (limited to 'activerecord/lib/active_record/associations/preloader')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/through_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/through_association.rb b/activerecord/lib/active_record/associations/preloader/through_association.rb index 70e97432e4..1fed7f74e7 100644 --- a/activerecord/lib/active_record/associations/preloader/through_association.rb +++ b/activerecord/lib/active_record/associations/preloader/through_association.rb @@ -84,7 +84,7 @@ module ActiveRecord end scope.references! reflection_scope.values[:references] - scope.order! reflection_scope.values[:order] if scope.eager_loading? + scope = scope.order reflection_scope.values[:order] if scope.eager_loading? end scope |