Changeset 8672

Timestamp:

01/19/08 04:19:53 (4 months ago)

Author:

bitsweat

Message:

Introduce preload query strategy for eager :includes. Closes #9640.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/association_preload.rb (added)
• trunk/activerecord/lib/active_record/associations.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/base.rb (modified) (1 diff)
• trunk/activerecord/test/cases/associations_test.rb (modified) (1 diff)
• trunk/activerecord/test/cases/associations/eager_test.rb (modified) (8 diffs)
• trunk/activerecord/test/cases/associations/join_model_test.rb (modified) (3 diffs)
• trunk/activerecord/test/models/post.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Introduce preload query strategy for eager :includes.  #9640 [Frederick Cheung, Aleksey Kondratenko]
-
-* Support aggregations in finder conditions.  #10572 [Ryan Kinderman]

trunk/activerecord/lib/active_record.rb

@@ -44 +44 @@
-require 'active_record/reflection'
-require 'active_record/associations'
+require 'active_record/association_preload'
-require 'active_record/aggregations'
-require 'active_record/transactions'
@@ -64 +65 @@
-  include ActiveRecord::Timestamp
-  include ActiveRecord::Associations
+  include ActiveRecord::AssociationPreload
-  include ActiveRecord::Aggregations
-  include ActiveRecord::Transactions

trunk/activerecord/lib/active_record/associations.rb

@@ -1366 +1366 @@
-          order = options[:order]
-          return false unless order
-
+to_s.
-            order_table_name != table_name
-          end
+        end
+
+        def references_eager_loaded_tables?(options)
+          include_eager_order?(options) || include_eager_conditions?(options)
-        end
-

trunk/activerecord/lib/active_record/base.rb

@@ -1238 +1238 @@
-
-        def find_every(options)
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-          records.each { |record| record.readonly! } if options[:readonly]

trunk/activerecord/test/cases/associations_test.rb

@@ -22 +22 @@
-           :computers
-
+  def test_include_with_order_works
+    assert_nothing_raised {Account.find(:first, :order => 'id', :include => :firm)}
+    assert_nothing_raised {Account.find(:first, :order => :id, :include => :firm)}
+  end
+
-  def test_bad_collection_keys
-    assert_raise(ArgumentError, 'ActiveRecord should have barked on bad collection keys') do

trunk/activerecord/test/cases/associations/eager_test.rb

@@ -1 +1 @@
-require 'abstract_unit'
-require 'models/post'
+require 'models/tagging'
-require 'models/comment'
-require 'models/author'
@@ -10 +11 @@
-class EagerAssociationTest < ActiveSupport::TestCase
-  fixtures :posts, :comments, :authors, :categories, :categories_posts,
-
+taggings, :
-
-  def test_loading_with_one_association
@@ -55 +56 @@
-    assert_equal 2, posts.first.categories.size
-    assert posts.first.comments.include?(comments(:greetings))
+  end
+
+  def test_duplicate_middle_objects
+    comments = Comment.find :all, :conditions => 'post_id = 1', :include => [:post => :author]
+    assert_no_queries do
+      comments.each {|comment| comment.post.author.name}
+    end
-  end
-
@@ -352 +360 @@
-    assert_equal posts(:thinking, :sti_comments), Post.find(:all, :include => [:author, :comments], :conditions => "authors.name = 'David'", :order => 'UPPER(posts.title), posts.id', :limit => 2, :offset => 1)
-    assert_equal posts(:sti_post_and_comments, :sti_comments), Post.find(:all, :include => [:author, :comments], :conditions => "authors.name = 'David'", :order => 'UPPER(posts.title) DESC, posts.id', :limit => 2, :offset => 1)
+  end
+
+  def test_preload_with_interpolation
+    assert_equal [comments(:greetings)], Post.find(posts(:welcome).id, :include => :comments_with_interpolated_conditions).comments_with_interpolated_conditions
+  end
+
+  def test_polymorphic_type_condition
+    post = Post.find(posts(:thinking).id, :include => :taggings)
+    assert post.taggings.include?(taggings(:thinking_general))
+    post = SpecialPost.find(posts(:thinking).id, :include => :taggings)
+    assert post.taggings.include?(taggings(:thinking_general))
-  end
-
@@ -406 +425 @@
-  def test_preconfigured_includes_with_belongs_to
-    author = posts(:welcome).author_with_posts
-equal 5, author.posts.size
+no_queries {assert_equal 5, author.posts.size}
-  end
-
-  def test_preconfigured_includes_with_has_one
-    comment = posts(:sti_comments).very_special_comment_with_post
-equal posts(:sti_comments), comment.post
+no_queries {assert_equal posts(:sti_comments), comment.post}
-  end
-
@@ -417 +436 @@
-    posts = authors(:david).posts_with_comments
-    one = posts.detect { |p| p.id == 1 }
-
-
+
+
+
+
-  end
-
@@ -424 +445 @@
-    posts = authors(:david).posts_with_categories
-    one = posts.detect { |p| p.id == 1 }
-
-
+
+
+
+
-  end
-
@@ -431 +454 @@
-    posts = authors(:david).posts_with_comments_and_categories
-    one = posts.detect { |p| p.id == 1 }
-
-
-
+
+
+
+
+
-  end
-

trunk/activerecord/test/cases/associations/join_model_test.rb

@@ -318 +318 @@
-    end
-    assert_raise ActiveRecord::EagerLoadPolymorphicError do
-
+, :conditions => 'bogus_table.column = 1'
-    end
-  end
@@ -332 +332 @@
-      assert_equal desired, tag_with_include.tagged_posts
-    end
+    assert_equal 4, tag_with_include.taggings.length
-  end
-
@@ -547 +548 @@
-  end
-
+  def test_polymorphic_has_many
+    expected = taggings(:welcome_general)
+    p = Post.find(posts(:welcome).id, :include => :taggings)
+    assert_no_queries {assert p.taggings.include?(expected)}
+    assert posts(:welcome).taggings.include?(taggings(:welcome_general))
+  end
+
+  def test_polymorphic_has_one
+    expected = posts(:welcome)
+
+    tagging  = Tagging.find(taggings(:welcome_general).id, :include => :taggable)
+    assert_no_queries { assert_equal expected, tagging.taggable}
+  end
+
+  def test_polymorphic_belongs_to
+    p = Post.find(posts(:welcome).id, :include => {:taggings => :taggable})
+    assert_no_queries {assert_equal posts(:welcome), p.taggings.first.taggable}
+  end
+
+  def test_preload_polymorphic_has_many_through
+    posts           = Post.find(:all, :order => 'posts.id')
+    posts_with_tags = Post.find(:all, :include => :tags, :order => 'posts.id')
+    assert_equal posts.length, posts_with_tags.length
+    posts.length.times do |i|
+      assert_equal posts[i].tags.length, assert_no_queries { posts_with_tags[i].tags.length }
+    end
+  end
+
+  def test_preload_polymorph_many_types
+    taggings = Tagging.find :all, :include => :taggable, :conditions => ['taggable_type != ?', 'FakeModel']
+    assert_no_queries do
+      taggings.first.taggable.id
+      taggings[1].taggable.id
+    end
+
+    taggables = taggings.map(&:taggable)
+    assert taggables.include?(items(:dvd))
+    assert taggables.include?(posts(:welcome))
+  end
+
+  def test_preload_polymorphic_has_many
+    posts               = Post.find(:all, :order => 'posts.id')
+    posts_with_taggings = Post.find(:all, :include => :taggings, :order => 'posts.id')
+    assert_equal posts.length, posts_with_taggings.length
+    posts.length.times do |i|
+      assert_equal posts[i].taggings.length, assert_no_queries { posts_with_taggings[i].taggings.length }
+    end
+  end
+
+  def test_belongs_to_shared_parent
+    comments = Comment.find(:all, :include => :post, :conditions => 'post_id = 1')
+    assert_no_queries do
+      assert_equal comments.first.post, comments[1].post
+    end
+  end
+
-  private
-    # create dynamic Post models to allow different dependency options

trunk/activerecord/test/models/post.rb

@@ -13 +13 @@
-    end
-  end
+
+  has_many :comments_with_interpolated_conditions, :class_name => 'Comment',
+      :conditions => ['#{"#{aliased_table_name}." rescue ""}body = ?', 'Thank you for the welcome']
-
-  has_one  :very_special_comment