Changeset 8914

Timestamp:

02/20/08 05:31:03 (9 months ago)

Author:

nzkoz

Message:

Move the eager load nested include tables into schema.rb and use delete_all instead of drop table to reset the state.

Files:

• trunk/activerecord/test/cases/associations/eager_load_nested_include_test.rb (modified) (3 diffs)
• trunk/activerecord/test/schema/schema.rb (modified) (1 diff)

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

@@ -1 +1 @@
-require 'cases/helper'
+
+
+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
+end
+class Square < ActiveRecord::Base
+  has_many :shape_expressions, :as => :shape
+end
+class Triangle < ActiveRecord::Base
+  has_many :shape_expressions, :as => :shape
+end
+class PaintColor  < ActiveRecord::Base
+  has_many   :shape_expressions, :as => :paint
+  belongs_to :non_poly, :foreign_key => "non_poly_one_id", :class_name => "NonPolyOne"
+end
+class PaintTexture < ActiveRecord::Base
+  has_many   :shape_expressions, :as => :paint
+  belongs_to :non_poly, :foreign_key => "non_poly_two_id", :class_name => "NonPolyTwo"
+end
+class NonPolyOne < ActiveRecord::Base
+  has_many :paint_colors
+end
+class NonPolyTwo < ActiveRecord::Base
+  has_many :paint_textures
+end
+
+
-
-class EagerLoadPolyAssocsTest < ActiveRecord::TestCase
@@ -6 +38 @@
-
-  def setup
-    silence_stream(STDOUT) { create_test_tables }
-    generate_test_object_graphs
-  end
-
-
-
-
-
-
+
+
+
+
+
-    end
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  end
-
-  def teardown
-    drop_tables
-  end
-
-  def drop_tables
-    conn = ActiveRecord::Base.connection
-    conn.reconnect!
-
-    silence_stream(STDOUT) do
-      [:circles, :squares, :triangles, :paint_colors, :paint_textures,
-       :shape_expressions, :non_poly_ones, :non_poly_twos].each do |t|
-        conn.drop_table t
-      end
-    end
-  end
-
-  # meant to be supplied as an ID, never returns 0
@@ -79 +82 @@
-  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
-end
-class Square < ActiveRecord::Base
-  has_many :shape_expressions, :as => :shape
-end
-class Triangle < ActiveRecord::Base
-  has_many :shape_expressions, :as => :shape
-end
-class PaintColor  < ActiveRecord::Base
-  has_many   :shape_expressions, :as => :paint
-  belongs_to :non_poly, :foreign_key => "non_poly_one_id", :class_name => "NonPolyOne"
-end
-class PaintTexture < ActiveRecord::Base
-  has_many   :shape_expressions, :as => :paint
-  belongs_to :non_poly, :foreign_key => "non_poly_two_id", :class_name => "NonPolyTwo"
-end
-class NonPolyOne < ActiveRecord::Base
-  has_many :paint_colors
-end
-class NonPolyTwo < ActiveRecord::Base
-  has_many :paint_textures
-end

trunk/activerecord/test/schema/schema.rb

@@ -374 +374 @@
-    t.integer :price
-  end
+  
+  [:circles, :squares, :triangles, :non_poly_ones, :non_poly_twos].each do |t|
+    create_table(t, :force => true) { }
+  end
+
+  create_table :shape_expressions, :force => true do |t|
+    t.string  :paint_type
+    t.integer :paint_id
+    t.string  :shape_type
+    t.integer :shape_id
+  end
+  
+  create_table :paint_colors, :force => true do |t|
+    t.integer :non_poly_one_id
+  end
+  create_table :paint_textures, :force => true do |t|
+    t.integer :non_poly_two_id
+  end
+  
-end