Ticket #11575: 0001-Add-ActiveRecord-option-to-store-the-full-class-name.patch

a/activerecord/lib/active_record/base.rb

@@ -436 +436 @@
-    cattr_accessor :schema_format , :instance_writer => false
-    @@schema_format = :ruby
-    
+    # Determine whether to store the full constant name including namespace when using STI
+    superclass_delegating_accessor :store_full_sti_class
+    self.store_full_sti_class = false
+    
-    class << self # Class methods
-      # Find operates with four different retrieval approaches:
-      #
@@ -1548 +1552 @@
-
-        def type_condition
-          quoted_inheritance_column = connection.quote_column_name(inheritance_column)
-
-
+store_full_sti_class ? name : 
+tore_full_sti_class ? subclass.name : s
-          end
-
-          " (#{type_condition}) "
@@ -2468 +2472 @@
-      # Message class in that example.
-      def ensure_proper_type
-        unless self.class.descends_from_active_record?
-
+store_full_sti_class ? self.class.name : 
-        end
-      end
-

a/activerecord/test/cases/inheritance_test.rb

@@ -2 +2 @@
-require 'models/company'
-require 'models/project'
-require 'models/subscriber'
+require 'models/collection_item'
-
-class InheritanceTest < ActiveRecord::TestCase
-  fixtures :companies, :projects, :subscribers, :accounts
+  
+  def test_should_store_demodulized_class_name_with_store_full_sti_class_option_disabled
+    item = ComicCollection::Item.new
+    assert_equal 'Item', item[:type]
+  end
+  
+  def test_should_store_full_class_name_with_store_full_sti_class_option_enabled
+    ActiveRecord::Base.store_full_sti_class = true
+    item = ComicCollection::Item.new
+    assert_equal 'ComicCollection::Item', item[:type]
+    ActiveRecord::Base.store_full_sti_class = false
+  end
+  
+  def test_different_namespace_subclass_should_load_correctly_with_store_full_sti_class_option
+    ActiveRecord::Base.store_full_sti_class = true
+    item = ComicCollection::Item.create :name => "Wolverine 2"
+    assert_not_nil CollectionItem.find(item.id)
+    assert_not_nil ComicCollection::Item.find(item.id)
+    ActiveRecord::Base.store_full_sti_class = false
+  end
-
-  def test_company_descends_from_active_record
-    assert_raise(NoMethodError) { ActiveRecord::Base.descends_from_active_record? }

/dev/null

@@ +1 @@
+class CollectionItem < ActiveRecord::Base
+end
+
+module ComicCollection
+  class Item < CollectionItem
+  end
+end

a/activerecord/test/schema/schema.rb

@@ -424 +424 @@
-    t.integer :sponsorable_id
-    t.string :sponsorable_type
-  end
+  
+  
+  create_table :collection_items, :force => true do |t|
+    t.string :name
+    t.string :type
+  end
-end

a/railties/configs/initializers/new_rails_defaults.rb

@@ -7 +7 @@
-# Include ActiveRecord class name as root for JSON serialized output.
-ActiveRecord::Base.include_root_in_json = true
-
+# Store the full class name (including module namespace) in STI type column
+ActiveRecord::Base.store_full_sti_class = true
+
-# Use ISO 8601 format for JSON serialized times and dates
-ActiveSupport.use_standard_json_time_format = true
-