Changeset 8219

Timestamp:

11/26/07 22:46:11 (1 year ago)

Author:

bitsweat

Message:

Foxy fixtures: support single-table inheritance. Closes #10234.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/fixtures.rb (modified) (2 diffs)
• trunk/activerecord/test/fixtures_test.rb (modified) (2 diffs)
• trunk/activerecord/test/fixtures/db_definitions/schema.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures/parrot.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures/parrots.yml (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Foxy fixtures: support single-table inheritance.  #10234 [tom]
-
-* Foxy fixtures: allow mixed usage to make migration easier and more attractive.  #10004 [lotswholetime]

trunk/activerecord/lib/active_record/fixtures.rb

@@ -582 +582 @@
-        end
-
-
+
+
+
+
+
+
+
+
+
-          case association.macro
-          when :belongs_to
@@ -649 +657 @@
-        column_names.include?(name)
-      end
+    end
+
+    def inheritance_column_name
+      @inheritance_column_name ||= model_class && model_class.inheritance_column
-    end
-

trunk/activerecord/test/fixtures_test.rb

@@ -563 +563 @@
-    assert_equal(parrots(:louis), treasures(:ruby).looter)
-  end
-
+
-  def test_only_generates_a_pk_if_necessary
-    m = Matey.find(:first)
@@ -569 +569 @@
-    m.target = pirates(:redbeard)
-  end
+
+  def test_supports_sti
+    assert_kind_of DeadParrot, parrots(:polly)
+    assert_equal pirates(:blackbeard), parrots(:polly).killer
+  end
-end
-

trunk/activerecord/test/fixtures/db_definitions/schema.rb

@@ -308 +308 @@
-  create_table :parrots, :force => true do |t|
-    t.column :name, :string
+    t.column :parrot_sti_class, :string
+    t.column :killer_id, :integer
-    t.column :created_at, :datetime
-    t.column :created_on, :datetime

trunk/activerecord/test/fixtures/parrot.rb

@@ -1 +1 @@
-class Parrot < ActiveRecord::Base
+  set_inheritance_column :parrot_sti_class
-  has_and_belongs_to_many :pirates
-  has_and_belongs_to_many :treasures
-  has_many :loots, :as => :looter
-end
+
+class LiveParrot < Parrot
+end
+
+class DeadParrot < Parrot
+  belongs_to :killer, :class_name => 'Pirate'
+end

trunk/activerecord/test/fixtures/parrots.yml

@@ -2 +2 @@
-  name: "Curious George"
-  treasures: diamond, sapphire
+  parrot_sti_class: LiveParrot
-
-louis:
-  name: "King Louis"
-  treasures: [diamond, sapphire]
+  parrot_sti_class: LiveParrot
-
-frederick:
-  name: $LABEL
+  parrot_sti_class: LiveParrot
-
-polly:
-  id: 4
-  name: $LABEL
+  killer: blackbeard
-  treasures: sapphire, ruby
+  parrot_sti_class: DeadParrot
-
-DEFAULTS: &DEFAULTS
-  treasures: sapphire, ruby
+  parrot_sti_class: LiveParrot
-
-davey: