diff options
4 files changed, 25 insertions, 30 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index cacb46ad38..67b0291bcd 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Simplify association proxy implementation by factoring construct_scope out of method_missing. #6643 [martin] + * Oracle: automatically detect the primary key. #6594 [vesaria, Michael Schoen] * Oracle: to increase performance, prefetch 100 rows and enable similar cursor sharing. Both are configurable in database.yml. #6607 [philbogle@gmail.com, ray.fortna@jobster.com, Michael Schoen] diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index 552c1ed06e..73c15ca0a9 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -147,6 +147,19 @@ module ActiveRecord end protected + def method_missing(method, *args, &block) + if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method)) + super + else + @reflection.klass.with_scope(construct_scope) { @reflection.klass.send(method, *args, &block) } + end + end + + # overloaded in derived Association classes to provide useful scoping depending on association type. + def construct_scope + {} + end + def reset_target! @target = Array.new end diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb index 1eea798ab4..c8e216f072 100644 --- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb +++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb @@ -86,16 +86,6 @@ module ActiveRecord alias :concat_with_attributes :push_with_attributes protected - def method_missing(method, *args, &block) - if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method)) - super - else - @reflection.klass.with_scope(:find => { :conditions => @finder_sql, :joins => @join_sql, :readonly => false }) do - @reflection.klass.send(method, *args, &block) - end - end - end - def count_records load_target.size end @@ -158,6 +148,10 @@ module ActiveRecord @join_sql = "INNER JOIN #{@reflection.options[:join_table]} ON #{@reflection.klass.table_name}.#{@reflection.klass.primary_key} = #{@reflection.options[:join_table]}.#{@reflection.association_foreign_key}" end + def construct_scope + { :find => { :conditions => @finder_sql, :joins => @join_sql, :readonly => false } } + end + # Join tables with additional columns on top of the two foreign keys must be considered ambigious unless a select # clause has been explicitly defined. Otherwise you can get broken records back, if, say, the join column also has # and id column, which will then overwrite the id column of the records coming back. diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index 0a275ab430..3ea8187cb8 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -93,26 +93,6 @@ module ActiveRecord end protected - def method_missing(method, *args, &block) - if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method)) - super - else - create_scoping = {} - set_belongs_to_association_for(create_scoping) - - @reflection.klass.with_scope( - :create => create_scoping, - :find => { - :conditions => @finder_sql, - :joins => @join_sql, - :readonly => false - } - ) do - @reflection.klass.send(method, *args, &block) - end - end - end - def load_target if !@owner.new_record? || foreign_key_present begin @@ -205,6 +185,12 @@ module ActiveRecord @counter_sql = @finder_sql end end + + def construct_scope + create_scoping = {} + set_belongs_to_association_for(create_scoping) + { :find => { :conditions => @finder_sql, :joins => @join_sql, :readonly => false }, :create => create_scoping } + end end end end |