From 4906b32450b21cb6063ed195802ad671ed9bed32 Mon Sep 17 00:00:00 2001 From: Marcel Molina Date: Tue, 22 Nov 2005 09:06:04 +0000 Subject: [PATCH] Apply [3159] to stable. Remove superfluous check for pluralize_table_names (use table_name which does this check when it's set). git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@3160 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../generators/components/model/model_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/railties/lib/rails_generator/generators/components/model/model_generator.rb b/railties/lib/rails_generator/generators/components/model/model_generator.rb index 2dfff81e61..a978b96b1c 100644 --- a/railties/lib/rails_generator/generators/components/model/model_generator.rb +++ b/railties/lib/rails_generator/generators/components/model/model_generator.rb @@ -12,7 +12,7 @@ def manifest # Model class, unit test, and fixtures. m.template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb") m.template 'unit_test.rb', File.join('test/unit', class_path, "#{file_name}_test.rb") - m.template 'fixtures.yml', File.join('test/fixtures', class_path, "#{ActiveRecord::Base.pluralize_table_names ? plural_name : singular_name}.yml") + m.template 'fixtures.yml', File.join('test/fixtures', class_path, "#{table_name}.yml") end end end -- GitLab