diff options
| author | Rick Olson <technoweenie@gmail.com> | 2007-07-12 06:23:50 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2007-07-12 06:23:50 +0000 |
| commit | f9b7394430f50c110b0f07d7e3c06d5b3d9b0f44 (patch) | |
| tree | e4521a3e586002aec7c4a3aa73105d11b6725c7c | |
| parent | 816522ecd8615bf96e8b932ac358fe9346b286ee (diff) | |
| download | rails-f9b7394430f50c110b0f07d7e3c06d5b3d9b0f44.tar.gz rails-f9b7394430f50c110b0f07d7e3c06d5b3d9b0f44.tar.bz2 rails-f9b7394430f50c110b0f07d7e3c06d5b3d9b0f44.zip | |
Default to plural table name in Rails Generator if ActiveRecord is not present. Closes #8963 [evan]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7183 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator/base.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 466d922f70..877decf90f 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Default to plural table name in Rails Generator if ActiveRecord is not present. Closes #8963 [evan] + * Added rake routes for listing all the defined routes in the system #8795 [josh] * db:create creates the database for the current environment if it's on localhost. db:create:all creates local databases for all environments. #8783 [matt] diff --git a/railties/lib/rails_generator/base.rb b/railties/lib/rails_generator/base.rb index 1c3d2936a4..95d716fb90 100644 --- a/railties/lib/rails_generator/base.rb +++ b/railties/lib/rails_generator/base.rb @@ -228,7 +228,7 @@ module Rails @name = name base_name, @class_path, @file_path, @class_nesting, @class_nesting_depth = extract_modules(@name) @class_name_without_nesting, @singular_name, @plural_name = inflect_names(base_name) - @table_name = ActiveRecord::Base.pluralize_table_names ? plural_name : singular_name + @table_name = (!defined?(ActiveRecord::Base) || ActiveRecord::Base.pluralize_table_names) ? plural_name : singular_name if @class_nesting.empty? @class_name = @class_name_without_nesting else |