diff options
| author | Wojciech Wnętrzak <w.wnetrzak@gmail.com> | 2012-07-06 21:22:53 +0200 |
|---|---|---|
| committer | Wojciech Wnętrzak <w.wnetrzak@gmail.com> | 2012-07-06 21:22:53 +0200 |
| commit | 8fe9b43b3016f2c0e7afad8fc081bbf37f267226 (patch) | |
| tree | 302525f6430ece96460da3ec31774ebc16292776 | |
| parent | f874b155611a837c97be80dd02681ab4c3c0a63e (diff) | |
| download | rails-8fe9b43b3016f2c0e7afad8fc081bbf37f267226.tar.gz rails-8fe9b43b3016f2c0e7afad8fc081bbf37f267226.tar.bz2 rails-8fe9b43b3016f2c0e7afad8fc081bbf37f267226.zip | |
Fixed generating namespaced table_name_prefix in engines
| -rw-r--r-- | activerecord/lib/rails/generators/active_record/model/templates/module.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/namespaced_generators_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/rails/generators/active_record/model/templates/module.rb b/activerecord/lib/rails/generators/active_record/model/templates/module.rb index fca2908080..a3bf1c37b6 100644 --- a/activerecord/lib/rails/generators/active_record/model/templates/module.rb +++ b/activerecord/lib/rails/generators/active_record/model/templates/module.rb @@ -1,7 +1,7 @@ <% module_namespacing do -%> module <%= class_path.map(&:camelize).join('::') %> def self.table_name_prefix - '<%= class_path.join('_') %>_' + '<%= namespaced? ? namespaced_class_path.join('_') : class_path.join('_') %>_' end end <% end -%> diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb index 2ae9dc61a7..db2b8af217 100644 --- a/railties/test/generators/namespaced_generators_test.rb +++ b/railties/test/generators/namespaced_generators_test.rb @@ -99,7 +99,7 @@ class NamespacedModelGeneratorTest < NamespacedGeneratorTestCase run_generator ["admin/account"] assert_file "app/models/test_app/admin.rb", /module TestApp/, /module Admin/ assert_file "app/models/test_app/admin.rb", /def self\.table_name_prefix/ - assert_file "app/models/test_app/admin.rb", /'admin_'/ + assert_file "app/models/test_app/admin.rb", /'test_app_admin_'/ assert_file "app/models/test_app/admin/account.rb", /module TestApp/, /class Admin::Account < ActiveRecord::Base/ end |