diff options
| author | Benedikt Deicke <benedikt@synatic.net> | 2012-04-19 10:04:24 +0200 |
|---|---|---|
| committer | Benedikt Deicke <benedikt@synatic.net> | 2012-04-19 10:04:24 +0200 |
| commit | 2c21a2f7eb9f8cc50a3e957784105e187f63d5f3 (patch) | |
| tree | 92f54fe136e36b836b8f1e8bbff8f64d5fd389a7 /activerecord/lib | |
| parent | 8491740ca5361ba9df20e1c8b906c709f5bfbc12 (diff) | |
| download | rails-2c21a2f7eb9f8cc50a3e957784105e187f63d5f3.tar.gz rails-2c21a2f7eb9f8cc50a3e957784105e187f63d5f3.tar.bz2 rails-2c21a2f7eb9f8cc50a3e957784105e187f63d5f3.zip | |
Revert "Revert "Fix #5667. Preloading should ignore scoping.""
This reverts commit 1166d49f62ccab789be208112163ad13183224e2.
Conflicts:
activerecord/test/cases/associations/eager_test.rb
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/association.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb index 779f8164cc..ab50e43ea0 100644 --- a/activerecord/lib/active_record/associations/preloader/association.rb +++ b/activerecord/lib/active_record/associations/preloader/association.rb @@ -77,7 +77,7 @@ module ActiveRecord # Some databases impose a limit on the number of ids in a list (in Oracle it's 1000) # Make several smaller queries if necessary or make one query if the adapter supports it sliced = owner_keys.each_slice(model.connection.in_clause_length || owner_keys.size) - records = sliced.map { |slice| records_for(slice) }.flatten + records = sliced.map { |slice| records_for(slice).to_a }.flatten end # Each record may have multiple owners, and vice-versa @@ -93,7 +93,8 @@ module ActiveRecord end def build_scope - scope = klass.scoped + scope = klass.unscoped + scope.default_scoped = true scope = scope.where(process_conditions(options[:conditions])) scope = scope.where(process_conditions(preload_options[:conditions])) |