0
@@ -1,3 +1,5 @@
0
+* Add ActiveRecord::Base.sti_name that checks ActiveRecord::Base#store_full_sti_class? and returns either the full or demodulized name. [rick]
0
+
0
 * Add first/last methods to associations/named_scope. Resolved #226. [Ryan Bates]
0
 
0
 *2.1.0 RC1 (May 11th, 2008)*

0
@@ -237,7 +237,7 @@ module ActiveRecord
0
         end
0
         
0
         def build_sti_condition
0
-          "#{@reflection.through_reflection.quoted_table_name}.#{@reflection.through_reflection.klass.inheritance_column} = #{@reflection.klass.quote_value(@reflection.through_reflection.klass.name.demodulize)}"
0
+          "#{@reflection.through_reflection.quoted_table_name}.#{@reflection.through_reflection.klass.inheritance_column} = #{@reflection.klass.quote_value(@reflection.through_reflection.klass.sti_name)}"
0
         end
0
 
0
         alias_method :sql_conditions, :conditions

0
@@ -1293,6 +1293,10 @@ module ActiveRecord #:nodoc:
0
         super
0
       end
0
 
0
+      def sti_name
0
+        store_full_sti_class ? name : name.demodulize
0
+      end
0
+
0
       private
0
         def find_initial(options)
0
           options.update(:limit => 1)
0
@@ -1452,7 +1456,11 @@ module ActiveRecord #:nodoc:
0
         # Nest the type name in the same module as this class.
0
         # Bar is "MyApp::Business::Bar" relative to MyApp::Business::Foo
0
         def type_name_with_module(type_name)
0
-          (/^::/ =~ type_name) ? type_name : "#{parent.name}::#{type_name}"
0
+          if store_full_sti_class
0
+            type_name
0
+          else
0
+            (/^::/ =~ type_name) ? type_name : "#{parent.name}::#{type_name}"
0
+          end
0
         end
0
 
0
         def construct_finder_sql(options)
0
@@ -1571,8 +1579,8 @@ module ActiveRecord #:nodoc:
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} = '#{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
+          type_condition = subclasses.inject("#{quoted_table_name}.#{quoted_inheritance_column} = '#{sti_name}' ") do |condition, subclass|
0
+            condition << "OR #{quoted_table_name}.#{quoted_inheritance_column} = '#{subclass.sti_name}' "
0
           end
0
 
0
           " (#{type_condition}) "
0
@@ -2508,7 +2516,7 @@ module ActiveRecord #:nodoc:
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, store_full_sti_class ? self.class.name : self.class.name.demodulize)
0
+          write_attribute(self.class.inheritance_column, self.class.sti_name)
0
         end
0
       end
0
 

0
@@ -5,7 +5,23 @@ require 'models/subscriber'
0
 
0
 class InheritanceTest < ActiveRecord::TestCase
0
   fixtures :companies, :projects, :subscribers, :accounts
0
-  
0
+
0
+  def test_class_with_store_full_sti_class_returns_full_name
0
+    old = ActiveRecord::Base.store_full_sti_class
0
+    ActiveRecord::Base.store_full_sti_class = true
0
+    assert_equal 'Namespaced::Company', Namespaced::Company.sti_name
0
+  ensure
0
+    ActiveRecord::Base.store_full_sti_class = old
0
+  end
0
+
0
+  def test_class_without_store_full_sti_class_returns_demodulized_name
0
+    old = ActiveRecord::Base.store_full_sti_class
0
+    ActiveRecord::Base.store_full_sti_class = false
0
+    assert_equal 'Company', Namespaced::Company.sti_name
0
+  ensure
0
+    ActiveRecord::Base.store_full_sti_class = old
0
+  end
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