kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

pass the association and connection to the scope method

Browse source
This commit is contained in:
Aaron Patterson 2014-02-14 14:20:07 -08:00
parent 3b675f05ff
commit 8e6ef92fd9
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/lib/active_record/associations/association.rb
View file

@ -94,7 +94,7 @@ module ActiveRecord
# actually gets built. # actually gets built.
def association_scope def association_scope
if klass if klass
@association_scope ||= AssociationScope.new(self).scope @association_scope ||= AssociationScope.new.scope(self, klass.connection)
end end
end end

10
activerecord/lib/active_record/associations/association_scope.rb
View file

@ -1,18 +1,12 @@
module ActiveRecord module ActiveRecord
module Associations module Associations
class AssociationScope #:nodoc: class AssociationScope #:nodoc:
attr_reader :association def scope(association, connection)
def initialize(association)
@association = association
end
def scope
klass = association.klass klass = association.klass
reflection = association.reflection reflection = association.reflection
scope = klass.unscoped scope = klass.unscoped
owner = association.owner owner = association.owner
alias_tracker = AliasTracker.new klass.connection alias_tracker = AliasTracker.new connection
scope.extending! Array(reflection.options[:extend]) scope.extending! Array(reflection.options[:extend])
add_constraints(scope, owner, klass, reflection, alias_tracker) add_constraints(scope, owner, klass, reflection, alias_tracker)

6
activerecord/test/cases/associations/association_scope_test.rb
View file

@ -6,8 +6,10 @@ module ActiveRecord
module Associations module Associations
class AssociationScopeTest < ActiveRecord::TestCase class AssociationScopeTest < ActiveRecord::TestCase
test 'does not duplicate conditions' do test 'does not duplicate conditions' do
association_scope = AssociationScope.new(Author.new.association(:welcome_posts)) association_scope = AssociationScope.new
wheres = association_scope.scope.where_values.map(&:right) scope = association_scope.scope(Author.new.association(:welcome_posts),
Author.connection)
wheres = scope.where_values.map(&:right)
assert_equal wheres.uniq, wheres assert_equal wheres.uniq, wheres
end end
end end