From f8783abf0cd409d53e7e104b576d45966252378b Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 3 Apr 2005 17:50:11 +0000 Subject: Made eager loading work even more git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1083 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/associations.rb | 20 +++++++++++++++++--- .../associations/has_many_association.rb | 22 +++++++++------------- .../associations/has_one_association.rb | 2 +- activerecord/lib/active_record/fixtures.rb | 7 ++++++- 4 files changed, 33 insertions(+), 18 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 956589fa84..071660e7cf 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -551,6 +551,14 @@ module ActiveRecord end association end + + define_method("set_#{association_name}_target") do |target| + association = association_proxy_class.new(self, + association_name, association_class_name, + association_class_primary_key_name, options) + association.target = target + instance_variable_set("@#{association_name}", association) + end end def collection_accessor_methods(association_name, association_class_name, association_class_primary_key_name, options, association_proxy_class) @@ -630,7 +638,7 @@ module ActiveRecord when :has_many record.send(reflection.name).target = extract_association_for_record(record, rows, reflection) when :has_one, :belongs_to - record.send("#{reflection.name}=", extract_association_for_record(record, rows, reflection).first) + record.send("set_#{reflection.name}_target", extract_association_for_record(record, rows, reflection).first) end end end @@ -644,8 +652,14 @@ module ActiveRecord sql << " FROM #{table_name} " reflections.each do |reflection| - sql << " LEFT JOIN #{reflection.klass.table_name} ON " + - "#{reflection.klass.table_name}.#{table_name.classify.foreign_key} = #{table_name}.#{primary_key} " + case reflection.macro + when :has_many, :has_one + sql << " LEFT JOIN #{reflection.klass.table_name} ON " + + "#{reflection.klass.table_name}.#{table_name.classify.foreign_key} = #{table_name}.#{primary_key} " + when :belongs_to + sql << " LEFT JOIN #{reflection.klass.table_name} ON " + + "#{reflection.klass.table_name}.#{reflection.klass.primary_key} = #{table_name}.#{reflection.klass.table_name.classify.foreign_key} " + end end sql << "#{options[:joins]} " if options[:joins] diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index 01374bd55a..f6bceee93a 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -50,17 +50,13 @@ module ActiveRecord end def find(*args) - # Return an Array if multiple ids are given. - expects_array = args.first.kind_of?(Array) - - ids = args.flatten.compact.uniq - - # If no ids given, raise RecordNotFound. - if ids.empty? - raise RecordNotFound, "Couldn't find #{@association_class.name} without an ID" + options = Base.send(:extract_options_from_args!, args) # If using a custom finder_sql, scan the entire collection. - elsif @options[:finder_sql] + if @options[:finder_sql] + expects_array = args.first.kind_of?(Array) + ids = args.flatten.compact.uniq + if ids.size == 1 id = ids.first record = load_target.detect { |record| id == record.id } @@ -68,11 +64,11 @@ module ActiveRecord else load_target.select { |record| ids.include?(record.id) } end - - # Otherwise, delegate to association class with conditions. else - args << { :conditions => "#{@association_class_primary_key_name} = #{@owner.quoted_id} #{@conditions ? " AND " + @conditions : ""}" } - @association_class.find(*args) + original_conditions = options[:conditions] ? " AND #{options[:conditions]}" : "" + options[:conditions] = + "#{@association_class_primary_key_name} = #{@owner.quoted_id} #{@conditions ? " AND " + @conditions : ""}#{original_conditions}" + @association_class.find(args.size == 1 ? args.first : args, options) end end diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb index e566089013..f3c3515055 100644 --- a/activerecord/lib/active_record/associations/has_one_association.rb +++ b/activerecord/lib/active_record/associations/has_one_association.rb @@ -38,7 +38,7 @@ module ActiveRecord private def find_target - @association_class.find_first(@finder_sql, @options[:order]) + @association_class.find(:first, :conditions => @finder_sql, :order => @options[:order]) end def target_obsolete? diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 21bf0249c8..77f701e4ab 100755 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -185,6 +185,9 @@ class Fixtures < Hash DEFAULT_FILTER_RE = /\.ya?ml$/ def self.instantiate_fixtures(object, table_name, fixtures, load_instances=true) + old_logger_level = ActiveRecord::Base.logger.level + ActiveRecord::Base.logger.level = Logger::ERROR + object.instance_variable_set "@#{table_name}", fixtures if load_instances fixtures.each do |name, fixture| @@ -193,12 +196,14 @@ class Fixtures < Hash end end end + + ActiveRecord::Base.logger.level = old_logger_level end def self.instantiate_all_loaded_fixtures(object, load_instances=true) all_loaded_fixtures.each do |table_name, fixtures| Fixtures.instantiate_fixtures(object, table_name, fixtures, load_instances) - end + end end cattr_accessor :all_loaded_fixtures -- cgit v1.2.3