ibm_db 4.0.0-x86-mingw32 → 5.1.0-x86-mingw32

data/test/cases/associations/cascaded_eager_loading_test.rb

@@ -1,188 +1,188 @@
-require "cases/helper"
-require 'models/post'
-require 'models/comment'
-require 'models/author'
-require 'models/categorization'
-require 'models/category'
-require 'models/company'
-require 'models/topic'
-require 'models/reply'
-require 'models/person'
-require 'models/vertex'
-require 'models/edge'
-
-class CascadedEagerLoadingTest < ActiveRecord::TestCase
-  fixtures :authors, :mixins, :companies, :posts, :topics, :accounts, :comments,
-           :categorizations, :people, :categories, :edges, :vertices
-
-  def test_eager_association_loading_with_cascaded_two_levels
-    authors = Author.all.merge!(:includes=>{:posts=>:comments}, :order=>"authors.id").to_a
-    assert_equal 3, authors.size
-    assert_equal 5, authors[0].posts.size
-    assert_equal 3, authors[1].posts.size
-    assert_equal 10, authors[0].posts.collect{|post| post.comments.size }.inject(0){|sum,i| sum+i}
-  end
-
-  def test_eager_association_loading_with_cascaded_two_levels_and_one_level
-    authors = Author.all.merge!(:includes=>[{:posts=>:comments}, :categorizations], :order=>"authors.id").to_a
-    assert_equal 3, authors.size
-    assert_equal 5, authors[0].posts.size
-    assert_equal 3, authors[1].posts.size
-    assert_equal 10, authors[0].posts.collect{|post| post.comments.size }.inject(0){|sum,i| sum+i}
-    assert_equal 1, authors[0].categorizations.size
-    assert_equal 2, authors[1].categorizations.size
-  end
-
-  def test_eager_association_loading_with_hmt_does_not_table_name_collide_when_joining_associations
-    assert_nothing_raised do
-      Author.joins(:posts).eager_load(:comments).where(:posts => {:tags_count => 1}).to_a
-    end
-    authors = Author.joins(:posts).eager_load(:comments).where(:posts => {:tags_count => 1}).to_a
-    assert_equal 1, assert_no_queries { authors.size }
-    assert_equal 10, assert_no_queries { authors[0].comments.size }
-  end
-
-  def test_eager_association_loading_grafts_stashed_associations_to_correct_parent
-    assert_nothing_raised do
-      Person.eager_load(:primary_contact => :primary_contact).where('primary_contacts_people_2.first_name = ?', 'Susan').order('people.id').to_a
-    end
-    assert_equal people(:michael), Person.eager_load(:primary_contact => :primary_contact).where('primary_contacts_people_2.first_name = ?', 'Susan').order('people.id').first
-  end
-
-  def test_cascaded_eager_association_loading_with_join_for_count
-    categories = Category.joins(:categorizations).includes([{:posts=>:comments}, :authors])
-
-    assert_equal 4, categories.count
-    assert_equal 4, categories.to_a.count
-    assert_equal 3, categories.distinct.count
-    assert_equal 3, categories.to_a.uniq.size # Must uniq since instantiating with inner joins will get dupes
-  end
-
-  def test_cascaded_eager_association_loading_with_duplicated_includes
-    categories = Category.includes(:categorizations).includes(:categorizations => :author).where("categorizations.id is not null").references(:categorizations)
-    assert_nothing_raised do
-      assert_equal 3, categories.count
-      assert_equal 3, categories.to_a.size
-    end
-  end
-
-  def test_cascaded_eager_association_loading_with_twice_includes_edge_cases
-    categories = Category.includes(:categorizations => :author).includes(:categorizations => :post).where("posts.id is not null").references(:posts)
-    assert_nothing_raised do
-      assert_equal 3, categories.count
-      assert_equal 3, categories.to_a.size
-    end
-  end
-
-  def test_eager_association_loading_with_join_for_count
-    authors = Author.joins(:special_posts).includes([:posts, :categorizations])
-
-    assert_nothing_raised { authors.count }
-    assert_queries(3) { authors.to_a }
-  end
-
-  def test_eager_association_loading_with_cascaded_two_levels_with_two_has_many_associations
-    authors = Author.all.merge!(:includes=>{:posts=>[:comments, :categorizations]}, :order=>"authors.id").to_a
-    assert_equal 3, authors.size
-    assert_equal 5, authors[0].posts.size
-    assert_equal 3, authors[1].posts.size
-    assert_equal 10, authors[0].posts.collect{|post| post.comments.size }.inject(0){|sum,i| sum+i}
-  end
-
-  def test_eager_association_loading_with_cascaded_two_levels_and_self_table_reference
-    authors = Author.all.merge!(:includes=>{:posts=>[:comments, :author]}, :order=>"authors.id").to_a
-    assert_equal 3, authors.size
-    assert_equal 5, authors[0].posts.size
-    assert_equal authors(:david).name, authors[0].name
-    assert_equal [authors(:david).name], authors[0].posts.collect{|post| post.author.name}.uniq
-  end
-
-  def test_eager_association_loading_with_cascaded_two_levels_with_condition
-    authors = Author.all.merge!(:includes=>{:posts=>:comments}, :where=>"authors.id=1", :order=>"authors.id").to_a
-    assert_equal 1, authors.size
-    assert_equal 5, authors[0].posts.size
-  end
-
-  def test_eager_association_loading_with_cascaded_three_levels_by_ping_pong
-    firms = Firm.all.merge!(:includes=>{:account=>{:firm=>:account}}, :order=>"companies.id").to_a
-    assert_equal 2, firms.size
-    assert_equal firms.first.account, firms.first.account.firm.account
-    assert_equal companies(:first_firm).account, assert_no_queries { firms.first.account.firm.account }
-    assert_equal companies(:first_firm).account.firm.account, assert_no_queries { firms.first.account.firm.account }
-  end
-
-  def test_eager_association_loading_with_has_many_sti
-    topics = Topic.all.merge!(:includes => :replies, :order => 'topics.id').to_a
-    first, second, = topics(:first).replies.size, topics(:second).replies.size
-    assert_no_queries do
-      assert_equal first, topics[0].replies.size
-      assert_equal second, topics[1].replies.size
-    end
-  end
-
-  def test_eager_association_loading_with_has_many_sti_and_subclasses
-    silly = SillyReply.new(:title => "gaga", :content => "boo-boo", :parent_id => 1)
-    silly.parent_id = 1
-    assert silly.save
-
-    topics = Topic.all.merge!(:includes => :replies, :order => ['topics.id', 'replies_topics.id']).to_a
-    assert_no_queries do
-      assert_equal 2, topics[0].replies.size
-      assert_equal 0, topics[1].replies.size
-    end
-  end
-
-  def test_eager_association_loading_with_belongs_to_sti
-    replies = Reply.all.merge!(:includes => :topic, :order => 'topics.id').to_a
-    assert replies.include?(topics(:second))
-    assert !replies.include?(topics(:first))
-    assert_equal topics(:first), assert_no_queries { replies.first.topic }
-  end
-
-  def test_eager_association_loading_with_multiple_stis_and_order
-    author = Author.all.merge!(:includes => { :posts => [ :special_comments , :very_special_comment ] }, :order => ['authors.name', 'comments.body', 'very_special_comments_posts.body'], :where => 'posts.id = 4').first
-    assert_equal authors(:david), author
-    assert_no_queries do
-      author.posts.first.special_comments
-      author.posts.first.very_special_comment
-    end
-  end
-
-  def test_eager_association_loading_of_stis_with_multiple_references
-    authors = Author.all.merge!(:includes => { :posts => { :special_comments => { :post => [ :special_comments, :very_special_comment ] } } }, :order => 'comments.body, very_special_comments_posts.body', :where => 'posts.id = 4').to_a
-    assert_equal [authors(:david)], authors
-    assert_no_queries do
-      authors.first.posts.first.special_comments.first.post.special_comments
-      authors.first.posts.first.special_comments.first.post.very_special_comment
-    end
-  end
-
-  def test_eager_association_loading_where_first_level_returns_nil
-    authors = Author.all.merge!(:includes => {:post_about_thinking => :comments}, :order => 'authors.id DESC').to_a
-    assert_equal [authors(:bob), authors(:mary), authors(:david)], authors
-    assert_no_queries do
-      authors[2].post_about_thinking.comments.first
-    end
-  end
-
-  def test_eager_association_loading_with_recursive_cascading_four_levels_has_many_through
-    source = Vertex.all.merge!(:includes=>{:sinks=>{:sinks=>{:sinks=>:sinks}}}, :order => 'vertices.id').first
-    assert_equal vertices(:vertex_4), assert_no_queries { source.sinks.first.sinks.first.sinks.first }
-  end
-
-  def test_eager_association_loading_with_recursive_cascading_four_levels_has_and_belongs_to_many
-    sink = Vertex.all.merge!(:includes=>{:sources=>{:sources=>{:sources=>:sources}}}, :order => 'vertices.id DESC').first
-    assert_equal vertices(:vertex_1), assert_no_queries { sink.sources.first.sources.first.sources.first.sources.first }
-  end
-
-  def test_eager_association_loading_with_cascaded_interdependent_one_level_and_two_levels
-    authors_relation = Author.all.merge!(includes: [:comments, { posts: :categorizations }], order: "authors.id")
-    authors = authors_relation.to_a
-    assert_equal 3, authors.size
-    assert_equal 10, authors[0].comments.size
-    assert_equal 1, authors[1].comments.size
-    assert_equal 5, authors[0].posts.size
-    assert_equal 3, authors[1].posts.size
-    assert_equal 3, authors[0].posts.collect { |post| post.categorizations.size }.inject(0) { |sum, i| sum+i }
-  end
-end
+require "cases/helper"
+require 'models/post'
+require 'models/comment'
+require 'models/author'
+require 'models/categorization'
+require 'models/category'
+require 'models/company'
+require 'models/topic'
+require 'models/reply'
+require 'models/person'
+require 'models/vertex'
+require 'models/edge'
+
+class CascadedEagerLoadingTest < ActiveRecord::TestCase
+  fixtures :authors, :mixins, :companies, :posts, :topics, :accounts, :comments,
+           :categorizations, :people, :categories, :edges, :vertices
+
+  def test_eager_association_loading_with_cascaded_two_levels
+    authors = Author.all.merge!(:includes=>{:posts=>:comments}, :order=>"authors.id").to_a
+    assert_equal 3, authors.size
+    assert_equal 5, authors[0].posts.size
+    assert_equal 3, authors[1].posts.size
+    assert_equal 10, authors[0].posts.collect{|post| post.comments.size }.inject(0){|sum,i| sum+i}
+  end
+
+  def test_eager_association_loading_with_cascaded_two_levels_and_one_level
+    authors = Author.all.merge!(:includes=>[{:posts=>:comments}, :categorizations], :order=>"authors.id").to_a
+    assert_equal 3, authors.size
+    assert_equal 5, authors[0].posts.size
+    assert_equal 3, authors[1].posts.size
+    assert_equal 10, authors[0].posts.collect{|post| post.comments.size }.inject(0){|sum,i| sum+i}
+    assert_equal 1, authors[0].categorizations.size
+    assert_equal 2, authors[1].categorizations.size
+  end
+
+  def test_eager_association_loading_with_hmt_does_not_table_name_collide_when_joining_associations
+    assert_nothing_raised do
+      Author.joins(:posts).eager_load(:comments).where(:posts => {:tags_count => 1}).to_a
+    end
+    authors = Author.joins(:posts).eager_load(:comments).where(:posts => {:tags_count => 1}).to_a
+    assert_equal 1, assert_no_queries { authors.size }
+    assert_equal 10, assert_no_queries { authors[0].comments.size }
+  end
+
+  def test_eager_association_loading_grafts_stashed_associations_to_correct_parent
+    assert_nothing_raised do
+      Person.eager_load(:primary_contact => :primary_contact).where('primary_contacts_people_2.first_name = ?', 'Susan').order('people.id').to_a
+    end
+    assert_equal people(:michael), Person.eager_load(:primary_contact => :primary_contact).where('primary_contacts_people_2.first_name = ?', 'Susan').order('people.id').first
+  end
+
+  def test_cascaded_eager_association_loading_with_join_for_count
+    categories = Category.joins(:categorizations).includes([{:posts=>:comments}, :authors])
+
+    assert_equal 4, categories.count
+    assert_equal 4, categories.to_a.count
+    assert_equal 3, categories.distinct.count
+    assert_equal 3, categories.to_a.uniq.size # Must uniq since instantiating with inner joins will get dupes
+  end
+
+  def test_cascaded_eager_association_loading_with_duplicated_includes
+    categories = Category.includes(:categorizations).includes(:categorizations => :author).where("categorizations.id is not null").references(:categorizations)
+    assert_nothing_raised do
+      assert_equal 3, categories.count
+      assert_equal 3, categories.to_a.size
+    end
+  end
+
+  def test_cascaded_eager_association_loading_with_twice_includes_edge_cases
+    categories = Category.includes(:categorizations => :author).includes(:categorizations => :post).where("posts.id is not null").references(:posts)
+    assert_nothing_raised do
+      assert_equal 3, categories.count
+      assert_equal 3, categories.to_a.size
+    end
+  end
+
+  def test_eager_association_loading_with_join_for_count
+    authors = Author.joins(:special_posts).includes([:posts, :categorizations])
+
+    assert_nothing_raised { authors.count }
+    assert_queries(3) { authors.to_a }
+  end
+
+  def test_eager_association_loading_with_cascaded_two_levels_with_two_has_many_associations
+    authors = Author.all.merge!(:includes=>{:posts=>[:comments, :categorizations]}, :order=>"authors.id").to_a
+    assert_equal 3, authors.size
+    assert_equal 5, authors[0].posts.size
+    assert_equal 3, authors[1].posts.size
+    assert_equal 10, authors[0].posts.collect{|post| post.comments.size }.inject(0){|sum,i| sum+i}
+  end
+
+  def test_eager_association_loading_with_cascaded_two_levels_and_self_table_reference
+    authors = Author.all.merge!(:includes=>{:posts=>[:comments, :author]}, :order=>"authors.id").to_a
+    assert_equal 3, authors.size
+    assert_equal 5, authors[0].posts.size
+    assert_equal authors(:david).name, authors[0].name
+    assert_equal [authors(:david).name], authors[0].posts.collect{|post| post.author.name}.uniq
+  end
+
+  def test_eager_association_loading_with_cascaded_two_levels_with_condition
+    authors = Author.all.merge!(:includes=>{:posts=>:comments}, :where=>"authors.id=1", :order=>"authors.id").to_a
+    assert_equal 1, authors.size
+    assert_equal 5, authors[0].posts.size
+  end
+
+  def test_eager_association_loading_with_cascaded_three_levels_by_ping_pong
+    firms = Firm.all.merge!(:includes=>{:account=>{:firm=>:account}}, :order=>"companies.id").to_a
+    assert_equal 2, firms.size
+    assert_equal firms.first.account, firms.first.account.firm.account
+    assert_equal companies(:first_firm).account, assert_no_queries { firms.first.account.firm.account }
+    assert_equal companies(:first_firm).account.firm.account, assert_no_queries { firms.first.account.firm.account }
+  end
+
+  def test_eager_association_loading_with_has_many_sti
+    topics = Topic.all.merge!(:includes => :replies, :order => 'topics.id').to_a
+    first, second, = topics(:first).replies.size, topics(:second).replies.size
+    assert_no_queries do
+      assert_equal first, topics[0].replies.size
+      assert_equal second, topics[1].replies.size
+    end
+  end
+
+  def test_eager_association_loading_with_has_many_sti_and_subclasses
+    silly = SillyReply.new(:title => "gaga", :content => "boo-boo", :parent_id => 1)
+    silly.parent_id = 1
+    assert silly.save
+
+    topics = Topic.all.merge!(:includes => :replies, :order => ['topics.id', 'replies_topics.id']).to_a
+    assert_no_queries do
+      assert_equal 2, topics[0].replies.size
+      assert_equal 0, topics[1].replies.size
+    end
+  end
+
+  def test_eager_association_loading_with_belongs_to_sti
+    replies = Reply.all.merge!(:includes => :topic, :order => 'topics.id').to_a
+    assert replies.include?(topics(:second))
+    assert !replies.include?(topics(:first))
+    assert_equal topics(:first), assert_no_queries { replies.first.topic }
+  end
+
+  def test_eager_association_loading_with_multiple_stis_and_order
+    author = Author.all.merge!(:includes => { :posts => [ :special_comments , :very_special_comment ] }, :order => ['authors.name', 'comments.body', 'very_special_comments_posts.body'], :where => 'posts.id = 4').first
+    assert_equal authors(:david), author
+    assert_no_queries do
+      author.posts.first.special_comments
+      author.posts.first.very_special_comment
+    end
+  end
+
+  def test_eager_association_loading_of_stis_with_multiple_references
+    authors = Author.all.merge!(:includes => { :posts => { :special_comments => { :post => [ :special_comments, :very_special_comment ] } } }, :order => 'comments.body, very_special_comments_posts.body', :where => 'posts.id = 4').to_a
+    assert_equal [authors(:david)], authors
+    assert_no_queries do
+      authors.first.posts.first.special_comments.first.post.special_comments
+      authors.first.posts.first.special_comments.first.post.very_special_comment
+    end
+  end
+
+  def test_eager_association_loading_where_first_level_returns_nil
+    authors = Author.all.merge!(:includes => {:post_about_thinking => :comments}, :order => 'authors.id DESC').to_a
+    assert_equal [authors(:bob), authors(:mary), authors(:david)], authors
+    assert_no_queries do
+      authors[2].post_about_thinking.comments.first
+    end
+  end
+
+  def test_eager_association_loading_with_recursive_cascading_four_levels_has_many_through
+    source = Vertex.all.merge!(:includes=>{:sinks=>{:sinks=>{:sinks=>:sinks}}}, :order => 'vertices.id').first
+    assert_equal vertices(:vertex_4), assert_no_queries { source.sinks.first.sinks.first.sinks.first }
+  end
+
+  def test_eager_association_loading_with_recursive_cascading_four_levels_has_and_belongs_to_many
+    sink = Vertex.all.merge!(:includes=>{:sources=>{:sources=>{:sources=>:sources}}}, :order => 'vertices.id DESC').first
+    assert_equal vertices(:vertex_1), assert_no_queries { sink.sources.first.sources.first.sources.first.sources.first }
+  end
+
+  def test_eager_association_loading_with_cascaded_interdependent_one_level_and_two_levels
+    authors_relation = Author.all.merge!(includes: [:comments, { posts: :categorizations }], order: "authors.id")
+    authors = authors_relation.to_a
+    assert_equal 3, authors.size
+    assert_equal 10, authors[0].comments.size
+    assert_equal 1, authors[1].comments.size
+    assert_equal 5, authors[0].posts.size
+    assert_equal 3, authors[1].posts.size
+    assert_equal 3, authors[0].posts.collect { |post| post.categorizations.size }.inject(0) { |sum, i| sum+i }
+  end
+end

data/test/cases/associations/eager_load_includes_full_sti_class_test.rb

@@ -1,36 +1,36 @@
-require 'cases/helper'
-require 'models/post'
-require 'models/tagging'
-
-module Namespaced
-  class Post < ActiveRecord::Base
-    self.table_name = 'posts'
-    has_one :tagging, :as => :taggable, :class_name => 'Tagging'
-  end
-end
-
-class EagerLoadIncludeFullStiClassNamesTest < ActiveRecord::TestCase
-
-  def setup
-    generate_test_objects
-  end
-
-  def generate_test_objects
-    post = Namespaced::Post.create( :title => 'Great stuff', :body => 'This is not', :author_id => 1 )
-    Tagging.create( :taggable => post )
-  end
-
-  def test_class_names
-    old = ActiveRecord::Base.store_full_sti_class
-
-    ActiveRecord::Base.store_full_sti_class = false
-    post = Namespaced::Post.includes(:tagging).find_by_title('Great stuff')
-    assert_nil post.tagging
-
-    ActiveRecord::Base.store_full_sti_class = true
-    post = Namespaced::Post.includes(:tagging).find_by_title('Great stuff')
-    assert_instance_of Tagging, post.tagging
-  ensure
-    ActiveRecord::Base.store_full_sti_class = old
-  end
-end
+require 'cases/helper'
+require 'models/post'
+require 'models/tagging'
+
+module Namespaced
+  class Post < ActiveRecord::Base
+    self.table_name = 'posts'
+    has_one :tagging, :as => :taggable, :class_name => 'Tagging'
+  end
+end
+
+class EagerLoadIncludeFullStiClassNamesTest < ActiveRecord::TestCase
+
+  def setup
+    generate_test_objects
+  end
+
+  def generate_test_objects
+    post = Namespaced::Post.create( :title => 'Great stuff', :body => 'This is not', :author_id => 1 )
+    Tagging.create( :taggable => post )
+  end
+
+  def test_class_names
+    old = ActiveRecord::Base.store_full_sti_class
+
+    ActiveRecord::Base.store_full_sti_class = false
+    post = Namespaced::Post.includes(:tagging).find_by_title('Great stuff')
+    assert_nil post.tagging
+
+    ActiveRecord::Base.store_full_sti_class = true
+    post = Namespaced::Post.includes(:tagging).find_by_title('Great stuff')
+    assert_instance_of Tagging, post.tagging
+  ensure
+    ActiveRecord::Base.store_full_sti_class = old
+  end
+end

data/test/cases/associations/eager_load_nested_include_test.rb

@@ -1,126 +1,126 @@
-require 'cases/helper'
-require 'models/post'
-require 'models/tag'
-require 'models/author'
-require 'models/comment'
-require 'models/category'
-require 'models/categorization'
-require 'models/tagging'
-
-module Remembered
-  extend ActiveSupport::Concern
-
-  included do
-    after_create :remember
-  protected
-    def remember; self.class.remembered << self; end
-  end
-
-  module ClassMethods
-    def remembered; @@remembered ||= []; end
-    def sample; @@remembered.sample; end
-  end
-end
-
-class ShapeExpression < ActiveRecord::Base
-  belongs_to :shape, :polymorphic => true
-  belongs_to :paint, :polymorphic => true
-end
-
-class Circle < ActiveRecord::Base
-  has_many :shape_expressions, :as => :shape
-  include Remembered
-end
-class Square < ActiveRecord::Base
-  has_many :shape_expressions, :as => :shape
-  include Remembered
-end
-class Triangle < ActiveRecord::Base
-  has_many :shape_expressions, :as => :shape
-  include Remembered
-end
-class PaintColor  < ActiveRecord::Base
-  has_many   :shape_expressions, :as => :paint
-  belongs_to :non_poly, :foreign_key => "non_poly_one_id", :class_name => "NonPolyOne"
-  include Remembered
-end
-class PaintTexture < ActiveRecord::Base
-  has_many   :shape_expressions, :as => :paint
-  belongs_to :non_poly, :foreign_key => "non_poly_two_id", :class_name => "NonPolyTwo"
-  include Remembered
-end
-class NonPolyOne < ActiveRecord::Base
-  has_many :paint_colors
-  include Remembered
-end
-class NonPolyTwo < ActiveRecord::Base
-  has_many :paint_textures
-  include Remembered
-end
-
-
-
-class EagerLoadPolyAssocsTest < ActiveRecord::TestCase
-  NUM_SIMPLE_OBJS = 50
-  NUM_SHAPE_EXPRESSIONS = 100
-
-  def setup
-    generate_test_object_graphs
-  end
-
-  teardown do
-    [Circle, Square, Triangle, PaintColor, PaintTexture,
-     ShapeExpression, NonPolyOne, NonPolyTwo].each(&:delete_all)
-  end
-
-  def generate_test_object_graphs
-    1.upto(NUM_SIMPLE_OBJS) do
-      [Circle, Square, Triangle, NonPolyOne, NonPolyTwo].map(&:create!)
-    end
-    1.upto(NUM_SIMPLE_OBJS) do
-      PaintColor.create!(:non_poly_one_id => NonPolyOne.sample.id)
-      PaintTexture.create!(:non_poly_two_id => NonPolyTwo.sample.id)
-    end
-    1.upto(NUM_SHAPE_EXPRESSIONS) do
-      shape_type = [Circle, Square, Triangle].sample
-      paint_type = [PaintColor, PaintTexture].sample
-      ShapeExpression.create!(:shape_type => shape_type.to_s, :shape_id => shape_type.sample.id,
-                              :paint_type => paint_type.to_s, :paint_id => paint_type.sample.id)
-    end
-  end
-
-  def test_include_query
-    res = ShapeExpression.all.merge!(:includes => [ :shape, { :paint => :non_poly } ]).to_a
-    assert_equal NUM_SHAPE_EXPRESSIONS, res.size
-    assert_queries(0) do
-      res.each do |se|
-        assert_not_nil se.paint.non_poly, "this is the association that was loading incorrectly before the change"
-        assert_not_nil se.shape, "just making sure other associations still work"
-      end
-    end
-  end
-end
-
-class EagerLoadNestedIncludeWithMissingDataTest < ActiveRecord::TestCase
-  def setup
-    @davey_mcdave = Author.create(:name => 'Davey McDave')
-    @first_post = @davey_mcdave.posts.create(:title => 'Davey Speaks', :body => 'Expressive wordage')
-    @first_comment = @first_post.comments.create(:body => 'Inflamatory doublespeak')
-    @first_categorization = @davey_mcdave.categorizations.create(:category => Category.first, :post => @first_post)
-  end
-
-  teardown do
-    @davey_mcdave.destroy
-    @first_post.destroy
-    @first_comment.destroy
-    @first_categorization.destroy
-  end
-
-  def test_missing_data_in_a_nested_include_should_not_cause_errors_when_constructing_objects
-    assert_nothing_raised do
-      # @davey_mcdave doesn't have any author_favorites
-      includes = {:posts => :comments, :categorizations => :category, :author_favorites => :favorite_author }
-      Author.all.merge!(:includes => includes, :where => {:authors => {:name => @davey_mcdave.name}}, :order => 'categories.name').to_a
-    end
-  end
-end
+require 'cases/helper'
+require 'models/post'
+require 'models/tag'
+require 'models/author'
+require 'models/comment'
+require 'models/category'
+require 'models/categorization'
+require 'models/tagging'
+
+module Remembered
+  extend ActiveSupport::Concern
+
+  included do
+    after_create :remember
+  protected
+    def remember; self.class.remembered << self; end
+  end
+
+  module ClassMethods
+    def remembered; @@remembered ||= []; end
+    def sample; @@remembered.sample; end
+  end
+end
+
+class ShapeExpression < ActiveRecord::Base
+  belongs_to :shape, :polymorphic => true
+  belongs_to :paint, :polymorphic => true
+end
+
+class Circle < ActiveRecord::Base
+  has_many :shape_expressions, :as => :shape
+  include Remembered
+end
+class Square < ActiveRecord::Base
+  has_many :shape_expressions, :as => :shape
+  include Remembered
+end
+class Triangle < ActiveRecord::Base
+  has_many :shape_expressions, :as => :shape
+  include Remembered
+end
+class PaintColor  < ActiveRecord::Base
+  has_many   :shape_expressions, :as => :paint
+  belongs_to :non_poly, :foreign_key => "non_poly_one_id", :class_name => "NonPolyOne"
+  include Remembered
+end
+class PaintTexture < ActiveRecord::Base
+  has_many   :shape_expressions, :as => :paint
+  belongs_to :non_poly, :foreign_key => "non_poly_two_id", :class_name => "NonPolyTwo"
+  include Remembered
+end
+class NonPolyOne < ActiveRecord::Base
+  has_many :paint_colors
+  include Remembered
+end
+class NonPolyTwo < ActiveRecord::Base
+  has_many :paint_textures
+  include Remembered
+end
+
+
+
+class EagerLoadPolyAssocsTest < ActiveRecord::TestCase
+  NUM_SIMPLE_OBJS = 50
+  NUM_SHAPE_EXPRESSIONS = 100
+
+  def setup
+    generate_test_object_graphs
+  end
+
+  teardown do
+    [Circle, Square, Triangle, PaintColor, PaintTexture,
+     ShapeExpression, NonPolyOne, NonPolyTwo].each(&:delete_all)
+  end
+
+  def generate_test_object_graphs
+    1.upto(NUM_SIMPLE_OBJS) do
+      [Circle, Square, Triangle, NonPolyOne, NonPolyTwo].map(&:create!)
+    end
+    1.upto(NUM_SIMPLE_OBJS) do
+      PaintColor.create!(:non_poly_one_id => NonPolyOne.sample.id)
+      PaintTexture.create!(:non_poly_two_id => NonPolyTwo.sample.id)
+    end
+    1.upto(NUM_SHAPE_EXPRESSIONS) do
+      shape_type = [Circle, Square, Triangle].sample
+      paint_type = [PaintColor, PaintTexture].sample
+      ShapeExpression.create!(:shape_type => shape_type.to_s, :shape_id => shape_type.sample.id,
+                              :paint_type => paint_type.to_s, :paint_id => paint_type.sample.id)
+    end
+  end
+
+  def test_include_query
+    res = ShapeExpression.all.merge!(:includes => [ :shape, { :paint => :non_poly } ]).to_a
+    assert_equal NUM_SHAPE_EXPRESSIONS, res.size
+    assert_queries(0) do
+      res.each do |se|
+        assert_not_nil se.paint.non_poly, "this is the association that was loading incorrectly before the change"
+        assert_not_nil se.shape, "just making sure other associations still work"
+      end
+    end
+  end
+end
+
+class EagerLoadNestedIncludeWithMissingDataTest < ActiveRecord::TestCase
+  def setup
+    @davey_mcdave = Author.create(:name => 'Davey McDave')
+    @first_post = @davey_mcdave.posts.create(:title => 'Davey Speaks', :body => 'Expressive wordage')
+    @first_comment = @first_post.comments.create(:body => 'Inflamatory doublespeak')
+    @first_categorization = @davey_mcdave.categorizations.create(:category => Category.first, :post => @first_post)
+  end
+
+  teardown do
+    @davey_mcdave.destroy
+    @first_post.destroy
+    @first_comment.destroy
+    @first_categorization.destroy
+  end
+
+  def test_missing_data_in_a_nested_include_should_not_cause_errors_when_constructing_objects
+    assert_nothing_raised do
+      # @davey_mcdave doesn't have any author_favorites
+      includes = {:posts => :comments, :categorizations => :category, :author_favorites => :favorite_author }
+      Author.all.merge!(:includes => includes, :where => {:authors => {:name => @davey_mcdave.name}}, :order => 'categories.name').to_a
+    end
+  end
+end