diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-25 10:21:48 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-25 10:21:48 -0200 |
| commit | 9826823e665e612f0a166da6b2f8e5007183400b (patch) | |
| tree | fa16159ce91ea733f36c85af6b2f6fd5db54ec49 /railties/lib/rails/generators | |
| parent | 48d05bdd97e067b534b158bdf56256b45bf59e48 (diff) | |
| parent | c45980fe6e8200837b70482a177bbca87b654fdf (diff) | |
| download | rails-9826823e665e612f0a166da6b2f8e5007183400b.tar.gz rails-9826823e665e612f0a166da6b2f8e5007183400b.tar.bz2 rails-9826823e665e612f0a166da6b2f8e5007183400b.zip | |
Merge pull request #8303 from jeremywrowe/master
Fixes improper database name when creating a new rails app with a '.'
Conflicts:
railties/CHANGELOG.md
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index e22be40381..b2d1be9b51 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -236,7 +236,7 @@ module Rails end def app_name - @app_name ||= defined_app_const_base? ? defined_app_name : File.basename(destination_root) + @app_name ||= (defined_app_const_base? ? defined_app_name : File.basename(destination_root)).tr(".", "_") end def defined_app_name |