Skip to content

Commit

Permalink
Revert "Revert "Fix rails#5667. Preloading should ignore scoping.""
Browse files Browse the repository at this point in the history
This reverts commit 1166d49.

Conflicts:

	activerecord/test/cases/associations/eager_test.rb
  • Loading branch information
benedikt committed Apr 19, 2012
1 parent 8491740 commit 2c21a2f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
6 changes: 6 additions & 0 deletions activerecord/CHANGELOG.md
@@ -1,3 +1,9 @@
## Rails 3.2.4 (unreleased) ##

* Association preloading shouldn't be affected by the current scoping.
This could cause infinite recursion and potentially other problems.
See GH #5667. *Jon Leighton*

## Rails 3.2.3 (unreleased) ##

* Added find_or_create_by_{attribute}! dynamic method. *Andrew White*
Expand Down
Expand Up @@ -77,7 +77,7 @@ def associated_records_by_owner
# 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
Expand All @@ -93,7 +93,8 @@ def associated_records_by_owner
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]))
Expand Down

0 comments on commit 2c21a2f

Please sign in to comment.