Changeset 5660

Timestamp:

12/01/06 21:24:47 (2 years ago)

Author:

bitsweat

Message:

Subclasses of an abstract class work with single-table inheritance. Closes #5704.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/base.rb (modified) (4 diffs)
• trunk/activerecord/test/base_test.rb (modified) (4 diffs)
• trunk/activerecord/test/fixtures/db_definitions/mysql.sql (modified) (3 diffs)
• trunk/activerecord/test/fixtures/db_definitions/sqlite.sql (modified) (2 diffs)
• trunk/activerecord/test/fixtures/post.rb (modified) (2 diffs)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Subclasses of an abstract class work with single-table inheritance.  #5704 [nick+rails@ag.arizona.edu, Ryan Davis, Jeremy Kemper]
-
-* Change fixture_path to a class inheritable accessor allowing test cases to have their own custom set of fixtures. #6672 [zdennis]

trunk/activerecord/lib/active_record/base.rb

@@ -817 +817 @@
-
-      def descends_from_active_record? # :nodoc:
- == Base
+.abstract_class?
-      end
-
@@ -1162 +1162 @@
-          segments << sanitize_sql(scope[:conditions]) if scope && scope[:conditions]
-          segments << sanitize_sql(conditions) unless conditions.nil?
-        
+
-          segments.compact!
-          sql << "WHERE (#{segments.join(") AND (")}) " unless segments.empty?
@@ -1363 +1363 @@
-        # Returns the class descending directly from ActiveRecord in the inheritance hierarchy.
-        def class_of_active_record_descendant(klass)
- == Base || klass.superclass
+
-            klass
-          elsif klass.superclass.nil?
@@ -1483 +1483 @@
-        end
-    end
+
+    # ActiveRecord::Base is abstract.
+    self.abstract_class = true
-
-    public

trunk/activerecord/test/base_test.rb

@@ -11 +11 @@
-require 'fixtures/subscriber'
-require 'fixtures/keyboard'
+require 'fixtures/post'
-
-class Category < ActiveRecord::Base; end
@@ -29 +30 @@
-
-class LoosePerson < ActiveRecord::Base
+  self.table_name = 'people'
+  self.abstract_class = true
-  attr_protected :credit_rating, :administrator
-  self.abstract_class = true
-end
-
@@ -38 +40 @@
-
-class TightPerson < ActiveRecord::Base
+  self.table_name = 'people'
-  attr_accessible :name, :address
-end
@@ -1362 +1365 @@
-  end
-
-
+
+
-    assert LoosePerson.abstract_class?
-    assert !LooseDescendant.abstract_class?
+  end
+
+  def test_base_class
-    assert_equal LoosePerson,     LoosePerson.base_class
-    assert_equal LooseDescendant, LooseDescendant.base_class
-    assert_equal TightPerson,     TightPerson.base_class
-    assert_equal TightPerson,     TightDescendant.base_class
+
+    assert_equal Post, Post.base_class
+    assert_equal Post, SpecialPost.base_class
+    assert_equal Post, StiPost.base_class
+    assert_equal SubStiPost, SubStiPost.base_class
+  end
+
+  def test_descends_from_active_record
+    # Tries to call Object.abstract_class?
+    assert_raise(NoMethodError) do
+      ActiveRecord::Base.descends_from_active_record?
+    end
+
+    # Abstract subclass of AR::Base.
+    assert LoosePerson.descends_from_active_record?
+
+    # Concrete subclass of an abstract class.
+    assert LooseDescendant.descends_from_active_record?
+
+    # Concrete subclass of AR::Base.
+    assert TightPerson.descends_from_active_record?
+
+    # Concrete subclass of a concrete class but has no type column.
+    assert TightDescendant.descends_from_active_record?
+
+    # Concrete subclass of AR::Base.
+    assert Post.descends_from_active_record?
+
+    # Abstract subclass of a concrete class which has a type column.
+    # This is pathological, as you'll never have Sub < Abstract < Concrete.
+    assert !StiPost.descends_from_active_record?
+
+    # Concrete subclasses an abstract class which has a type column.
+    assert SubStiPost.descends_from_active_record?
+  end
+
+  def test_find_on_abstract_base_class_doesnt_use_type_condition
+    old_class = LooseDescendant
+    Object.send :remove_const, :LooseDescendant
+
+    descendant = old_class.create!
+    assert_not_nil LoosePerson.find(descendant.id), "Should have found instance of LooseDescendant when finding abstract LoosePerson: #{descendant.inspect}"
+  ensure
+    unless Object.const_defined?(:LooseDescendant)
+      Object.const_set :LooseDescendant, old_class
+    end
-  end
-

trunk/activerecord/test/fixtures/db_definitions/mysql.sql

@@ -160 +160 @@
-  `title` VARCHAR(255) NOT NULL,
-  `body` TEXT NOT NULL,
-NOT
+default
-) TYPE=InnoDB;
-
@@ -167 +167 @@
-  `post_id` INTEGER NOT NULL,
-  `body` TEXT NOT NULL,
-NOT
+default
-) TYPE=InnoDB;
-
@@ -185 +185 @@
-  `id` int(11) NOT NULL auto_increment,
-  `name` VARCHAR(255) NOT NULL,
-NOT
+default
-  PRIMARY KEY  (`id`)
-) TYPE=InnoDB;

trunk/activerecord/test/fixtures/db_definitions/sqlite.sql

@@ -145 +145 @@
-  'author_id' INTEGER,
-  'title' VARCHAR(255) NOT NULL,
-NO
+DEFAUL
-  'body' TEXT NOT NULL
-);
@@ -152 +152 @@
-  'id' INTEGER NOT NULL PRIMARY KEY,
-  'post_id' INTEGER NOT NULL,
-NO
+DEFAUL
-  'body' TEXT NOT NULL
-);

trunk/activerecord/test/fixtures/post.rb

@@ -47 +47 @@
-end
-
-;
+
-
-class StiPost < Post
@@ -55 +55 @@
-
-class SubStiPost < StiPost
+  self.table_name = Post.table_name
-end