Changeset 6013

Timestamp:

01/23/07 04:19:16 (2 years ago)

Author:

bitsweat

Message:

Subclasses of an abstract class work with single-table inheritance. References #5704, closes #7284.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/base.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures/company.rb (modified) (1 diff)
• trunk/activerecord/test/inheritance_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Subclasses of an abstract class work with single-table inheritance.  #5704, #7284 [BertG, nick+rails@ag.arizona.edu]
-
-* Make sure sqlite3 driver closes open connections on disconnect [Rob Rasmussen]

trunk/activerecord/lib/active_record/base.rb

@@ -818 +818 @@
-      end
-
-
-
+
+
+
+
+
+
+
-      end
-

trunk/activerecord/test/fixtures/company.rb

@@ -1 @@
-
+
+
+
+
+
-  attr_protected :rating
-  set_sequence_name :companies_nonstd_seq

trunk/activerecord/test/inheritance_test.rb

@@ -6 +6 @@
-class InheritanceTest < Test::Unit::TestCase
-  fixtures :companies, :projects, :subscribers, :accounts
+
+  def test_company_descends_from_active_record
+    assert_raise(NoMethodError) { ActiveRecord::Base.descends_from_active_record? }
+    assert AbstractCompany.descends_from_active_record?, 'AbstractCompany should descend from ActiveRecord::Base'
+    assert Company.descends_from_active_record?, 'Company should descend from ActiveRecord::Base'
+    assert !Class.new(Company).descends_from_active_record?, 'Company subclass should not descend from ActiveRecord::Base'
+  end
-
-  def test_a_bad_type_column