0
@@ -1026,7 +1026,7 @@ module ActiveRecord
0
         # Create the callbacks to update counter cache
0
         if options[:counter_cache]
0
           cache_column = options[:counter_cache] == true ?
0
-            "#{self.to_s.underscore.pluralize}_count" :
0
+            "#{self.to_s.demodulize.underscore.pluralize}_count" :
0
             options[:counter_cache]
0
 
0
           method_name = "belongs_to_counter_cache_after_create_for_#{reflection.name}".to_sym
0
@@ -1755,12 +1755,12 @@ module ActiveRecord
0
 
0
         def create_extension_modules(association_id, block_extension, extensions)
0
           if block_extension
0
-            extension_module_name = "#{self.to_s}#{association_id.to_s.camelize}AssociationExtension"
0
+            extension_module_name = "#{self.to_s.demodulize}#{association_id.to_s.camelize}AssociationExtension"
0
 
0
             silence_warnings do
0
-              Object.const_set(extension_module_name, Module.new(&block_extension))
0
+              self.parent.const_set(extension_module_name, Module.new(&block_extension))
0
             end
0
-            Array(extensions).push(extension_module_name.constantize)
0
+            Array(extensions).push("#{self.parent}::#{extension_module_name}".constantize)
0
           else
0
             Array(extensions)
0
           end

0
@@ -3,6 +3,7 @@ require 'models/post'
0
 require 'models/comment'
0
 require 'models/project'
0
 require 'models/developer'
0
+require 'models/company_in_module'
0
 
0
 class AssociationsExtensionsTest < ActiveRecord::TestCase
0
   fixtures :projects, :developers, :developers_projects, :comments, :posts
0
@@ -44,4 +45,18 @@ class AssociationsExtensionsTest < ActiveRecord::TestCase
0
     david = Marshal.load(Marshal.dump(david))
0
     assert_equal projects(:action_controller), david.projects_extended_by_name.find_most_recent
0
   end
0
+
0
+
0
+  def test_extension_name
0
+    extension = Proc.new {}
0
+    name = :association_name
0
+
0
+    assert_equal 'DeveloperAssociationNameAssociationExtension', Developer.send(:create_extension_modules, name, extension, []).first.name
0
+    assert_equal 'MyApplication::Business::DeveloperAssociationNameAssociationExtension',
0
+MyApplication::Business::Developer.send(:create_extension_modules, name, extension, []).first.name
0
+    assert_equal 'MyApplication::Business::DeveloperAssociationNameAssociationExtension', MyApplication::Business::Developer.send(:create_extension_modules, name, extension, []).first.name
0
+    assert_equal 'MyApplication::Business::DeveloperAssociationNameAssociationExtension', MyApplication::Business::Developer.send(:create_extension_modules, name, extension, []).first.name
0
+  end
0
+
0
+
0
 end