Ticket #6107: reflection_should_respect_pluralization_setting-r6930.patch

activerecord/test/reflection_test.rb

@@ -92 +92 @@
-  end
-
-  def test_has_many_reflection
+    classes = [Client, PluralClients, PluralThroughClients, Firm]
+    
-    reflection_for_clients = ActiveRecord::Reflection::AssociationReflection.new(:has_many, :clients, { :order => "id", :dependent => :destroy }, Firm)
+    reflection_for_plural_clients = ActiveRecord::Reflection::AssociationReflection.new(:has_many, :plural_clients, {}, Firm)
+    reflection_for_plural_through_clients = ActiveRecord::Reflection::AssociationReflection.new(:has_many, :plural_through_clients, { :through => :plural_clients }, Firm)
-
-    assert_equal reflection_for_clients, Firm.reflect_on_association(:clients)
+    assert_equal reflection_for_plural_clients , Firm.reflect_on_association(:plural_clients)
+    assert_equal reflection_for_plural_through_clients , Firm.reflect_on_association(:plural_through_clients)
-
-    assert_equal Client, Firm.reflect_on_association(:clients).klass
-    assert_equal 'companies', Firm.reflect_on_association(:clients).table_name
-
-    assert_equal Client, Firm.reflect_on_association(:clients_of_firm).klass
-    assert_equal 'companies', Firm.reflect_on_association(:clients_of_firm).table_name
+    
+    ActiveRecord::Base.pluralize_table_names = false
+    classes.each(&:reset_table_name)
+    
+    assert_equal PluralClients, Firm.reflect_on_association(:plural_clients).klass
+    assert_equal 'companies', Firm.reflect_on_association(:plural_clients).table_name
+    
+    assert_equal PluralThroughClients, Firm.reflect_on_association(:plural_through_clients).klass
+    assert_equal 'companies', Firm.reflect_on_association(:plural_through_clients).table_name
+
+    ActiveRecord::Base.pluralize_table_names = true
+    classes.each(&:reset_table_name)
-  end
-
-  def test_has_one_reflection
@@ -150 +168 @@
-  end
-  
-  def test_reflection_of_all_associations
-7
-5
+9
+7
-    assert_equal 2, Firm.reflect_on_all_associations(:has_one).size
-    assert_equal 0, Firm.reflect_on_all_associations(:belongs_to).size
-  end

activerecord/test/fixtures/company.rb

@@ -39 +39 @@
-           :finder_sql  => 'SELECT * FROM companies WHERE client_of = 1000',
-           :counter_sql => 'SELECT COUNT(*) FROM companies WHERE client_of = 1000'
-  has_many :plain_clients, :class_name => 'Client'
+  has_many :plural_clients
+  has_many :plural_through_clients, :through => :plural_clients
-
-  has_one :account, :foreign_key => "firm_id", :dependent => :destroy
-end
@@ -111 +113 @@
-      errors.add_on_empty "credit_limit"
-    end
-end
+
+class PluralClients < Client
+  has_many :plural_through_clients
+end
+
+class PluralThroughClients < Client
+end

activerecord/lib/active_record/reflection.rb

@@ -200 +200 @@
-            options[:source_type] || source_reflection.class_name
-          else
-            class_name = name.to_s.camelize
-
+ActiveRecord::Base.pluralize_table_names && 
-            class_name
-          end
-        end