0
@@ -439,6 +439,10 @@
0
     cattr_accessor :schema_format , :instance_writer => false
0
     @@schema_format = :ruby
0
     
0
+    # Determine whether to store the full constant name including namespace when using STI
0
+    superclass_delegating_accessor :store_full_sti_class
0
+    self.store_full_sti_class = false
0
+    
0
     class << self # Class methods
0
       # Find operates with four different retrieval approaches:
0
       #
0
@@ -1557,8 +1561,8 @@
0
 
0
         def type_condition
0
           quoted_inheritance_column = connection.quote_column_name(inheritance_column)
0
-          type_condition = subclasses.inject("#{quoted_table_name}.#{quoted_inheritance_column} = '#{name.demodulize}' ") do |condition, subclass|
0
-            condition << "OR #{quoted_table_name}.#{quoted_inheritance_column} = '#{subclass.name.demodulize}' "
0
+          type_condition = subclasses.inject("#{quoted_table_name}.#{quoted_inheritance_column} = '#{store_full_sti_class ? name : name.demodulize}' ") do |condition, subclass|
0
+            condition << "OR #{quoted_table_name}.#{quoted_inheritance_column} = '#{store_full_sti_class ? subclass.name : subclass.name.demodulize}' "
0
           end
0
 
0
           " (#{type_condition}) "
0
@@ -2492,7 +2496,7 @@
0
       # Message class in that example.
0
       def ensure_proper_type
0
         unless self.class.descends_from_active_record?
0
-          write_attribute(self.class.inheritance_column,  Inflector.demodulize(self.class.name))
0
+          write_attribute(self.class.inheritance_column, store_full_sti_class ? self.class.name : Inflector.demodulize(self.class.name))
0
         end
0
       end
0
 

0
@@ -5,6 +5,34 @@
0
 
0
 class InheritanceTest < ActiveRecord::TestCase
0
   fixtures :companies, :projects, :subscribers, :accounts
0
+  
0
+  def test_should_store_demodulized_class_name_with_store_full_sti_class_option_disabled
0
+    old = ActiveRecord::Base.store_full_sti_class
0
+    ActiveRecord::Base.store_full_sti_class = false
0
+    item = Namespaced::Company.new
0
+    assert_equal 'Company', item[:type]
0
+  ensure
0
+    ActiveRecord::Base.store_full_sti_class = old
0
+  end
0
+  
0
+  def test_should_store_full_class_name_with_store_full_sti_class_option_enabled
0
+    old = ActiveRecord::Base.store_full_sti_class
0
+    ActiveRecord::Base.store_full_sti_class = true
0
+    item = Namespaced::Company.new
0
+    assert_equal 'Namespaced::Company', item[:type]
0
+  ensure
0
+    ActiveRecord::Base.store_full_sti_class = old
0
+  end
0
+  
0
+  def test_different_namespace_subclass_should_load_correctly_with_store_full_sti_class_option
0
+    old = ActiveRecord::Base.store_full_sti_class
0
+    ActiveRecord::Base.store_full_sti_class = true
0
+    item = Namespaced::Company.create :name => "Wolverine 2"
0
+    assert_not_nil Company.find(item.id)
0
+    assert_not_nil Namespaced::Company.find(item.id)
0
+  ensure
0
+    ActiveRecord::Base.store_full_sti_class = old
0
+  end
0
 
0
   def test_company_descends_from_active_record
0
     assert_raise(NoMethodError) { ActiveRecord::Base.descends_from_active_record? }

0
@@ -15,6 +15,10 @@
0
   end
0
 end
0
 
0
+module Namespaced
0
+  class Company < ::Company
0
+  end
0
+end
0
 
0
 class Firm < Company
0
   has_many :clients, :order => "id", :dependent => :destroy, :counter_sql =>

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