diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-03-30 16:18:39 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-03-30 16:19:32 +0100 |
| commit | 86aefdb4f2b957acc6d6c7eef557dff6a3888803 (patch) | |
| tree | e0dfe5c38ccd91df9e81b5b75bd1888016c0727f /activerecord/lib/active_record/associations/preloader/association.rb | |
| parent | 1141f71601ff61fb299c86d814c07209f1430024 (diff) | |
| download | rails-86aefdb4f2b957acc6d6c7eef557dff6a3888803.tar.gz rails-86aefdb4f2b957acc6d6c7eef557dff6a3888803.tar.bz2 rails-86aefdb4f2b957acc6d6c7eef557dff6a3888803.zip | |
Fix #5667. Preloading should ignore scoping.
Diffstat (limited to 'activerecord/lib/active_record/associations/preloader/association.rb')
| -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 253998fb23..b4c3908b10 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(interpolate(options[:conditions])) scope = scope.where(interpolate(preload_options[:conditions])) |