Correct fixture behavior when table name pluralization is off. Closes #2719.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2862 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

activerecord/CHANGELOG

@@ -1,5 +1,7 @@
 *SVN*
 
+* Correct fixture behavior when table name pluralization is off.  #2719 [Rick Bradley <rick@rickbradley.com>]
+
 * Added extension capabilities to has_many and has_and_belongs_to_many proxies [DHH]. Example:
 
     class Account < ActiveRecord::Base
@@ -21,8 +23,6 @@
   Note that the anoymous module must be declared using brackets, not do/end (due to order of evaluation).
  
 
-* A missing primary key column shouldn't raise an error when generating its error message.  [Don Park <don.park@gmail.com>]
-
 * Changed :dbfile to :database for SQLite adapter for consistency (old key still works as an alias) #2644 [Dan Peterson]
 
 * Added migration support for Oracle #2647 [Michael Schoen]

activerecord/lib/active_record/fixtures.rb

@@ -270,7 +270,7 @@ class Fixtures < YAML::Omap
   def initialize(connection, table_name, fixture_path, file_filter = DEFAULT_FILTER_RE)
     @connection, @table_name, @fixture_path, @file_filter = connection, table_name, fixture_path, file_filter
 
-    @class_name = Inflector.classify(@table_name)
+    @class_name = ActiveRecord::Base.pluralize_table_names ? @table_name.singularize.camelize : @table_name.camelize
     @table_name = ActiveRecord::Base.table_name_prefix + @table_name + ActiveRecord::Base.table_name_suffix
     read_fixture_files
   end
@@ -436,8 +436,10 @@ module Test #:nodoc:
 
       def self.require_fixture_classes(table_names=nil)
         (table_names || fixture_table_names).each do |table_name| 
+          file_name = table_name.to_s
+          file_name = file_name.singularize if ActiveRecord::Base.pluralize_table_names
           begin
-            require Inflector.singularize(table_name.to_s)
+            require file_name
           rescue LoadError
             # Let's hope the developer has included it himself
           end