Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Pass a base relation to build_default_scope when joining

This allows the default scope to be built using the current table alias.
Resolves #12770
  • Loading branch information...
commit 70a5e5638bfd3b2543bb9d4805cbefec84b6b1ce 1 parent 467cb90
@al2o3cr al2o3cr authored
View
2  activerecord/lib/active_record/associations/join_dependency/join_association.rb
@@ -54,7 +54,7 @@ def join_constraints(foreign_table, foreign_klass, node, join_type, tables, scop
end
scope_chain_index += 1
- scope_chain_items.concat [klass.send(:build_default_scope)].compact
+ scope_chain_items.concat [klass.send(:build_default_scope, ActiveRecord::Relation.create(klass, table))].compact
rel = scope_chain_items.inject(scope_chain_items.shift) do |left, right|
left.merge right
View
6 activerecord/lib/active_record/scoping/default.rb
@@ -93,14 +93,14 @@ def default_scope(scope = nil)
self.default_scopes += [scope]
end
- def build_default_scope # :nodoc:
+ def build_default_scope(base_rel = relation) # :nodoc:
if !Base.is_a?(method(:default_scope).owner)
# The user has defined their own default scope method, so call that
evaluate_default_scope { default_scope }
elsif default_scopes.any?
evaluate_default_scope do
- default_scopes.inject(relation) do |default_scope, scope|
- default_scope.merge(unscoped { scope.call })
+ default_scopes.inject(base_rel) do |default_scope, scope|
+ default_scope.merge(base_rel.scoping { scope.call })
end
end
end
View
9 activerecord/test/cases/associations/inner_join_association_test.rb
@@ -117,4 +117,13 @@ def test_find_with_conditions_on_through_reflection
assert_equal [author], Author.where(id: author).joins(:special_categorizations)
end
+
+ test "the default scope of the target is correctly aliased when joining associations" do
+ author = Author.create! name: "Jon"
+ author.categories.create! name: 'Not Special'
+ author.special_categories.create! name: 'Special'
+
+ categories = author.categories.includes(:special_categorizations).references(:special_categorizations).to_a
+ assert_equal 2, categories.size
+ end
end
View
1  activerecord/test/models/category.rb
@@ -22,6 +22,7 @@ def self.what_are_you
end
has_many :categorizations
+ has_many :special_categorizations
has_many :post_comments, :through => :posts, :source => :comments
has_many :authors, :through => :categorizations
Please sign in to comment.
Something went wrong with that request. Please try again.