Ticket #9758: active_record_reflection_fix.patch

lib/active_record/reflection.rb

@@ -110 +110 @@
-
-      private
-        def derive_class_name
-
+
+
-        end
-    end
-
@@ -199 +200 @@
-          if through_reflection
-            options[:source_type] || source_reflection.class_name
-          else
-name.to_s.camelize
+super
-            class_name = class_name.singularize if [ :has_many, :has_and_belongs_to_many ].include?(macro)
-            class_name
-          end

test/reflection_test.rb

@@ -165 +165 @@
-    assert_equal 0, Firm.reflect_on_all_associations(:belongs_to).size
-  end
-
+  def test_reflection_class_name
+    reflection = ActiveRecord::Base.create_reflection(:has_many, :clients, {}, Firm)
+    assert_equal 'Client', reflection.class_name
+  end
+
+  def test_reflection_class_name_for_classes_nested_in_modules
+    reflection = ActiveRecord::Base.create_reflection(:has_many, :clients, {}, MyApplication::Business::Firm)
+    assert_equal 'MyApplication::Business::Client', reflection.class_name
+  end
+
-  private
-    def assert_reflection(klass, association, options)
-      assert reflection = klass.reflect_on_association(association)