Use dup'ed options hash

[ckoenig]

Otherwise, at least using JRuby, the replacements in convert_database_option_for_jruby won't work. Thus a call to

bundle exec rails app:update

fails. Simply replacing those replace statements doesn't seem to work either, since the options hash seems to be frozen, too.

[rails-bot]

Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @georgeclaghorn (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

This repository is being automatically checked for code quality issues using Code Climate. You can see results for this analysis in the PR status below. Newly introduced issues should be fixed before a Pull Request is considered ready to review.

Please see the contribution instructions for more information.

[y-yagi]

We want to keep frozen_string_literal.
How about to dup options instead of removing frozen_string_literal?

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 400f954..4176bb4 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -315,11 +315,14 @@ def gem_for_database
 
       def convert_database_option_for_jruby
         if defined?(JRUBY_VERSION)
-          case options[:database]
-          when "postgresql" then options[:database].replace "jdbcpostgresql"
-          when "mysql"      then options[:database].replace "jdbcmysql"
-          when "sqlite3"    then options[:database].replace "jdbcsqlite3"
+          opt = options.dup
+          case opt[:database]
+          when "postgresql" then opt[:database] = "jdbcpostgresql"
+          when "mysql"      then opt[:database] = "jdbcmysql"
+          when "sqlite3"    then opt[:database] = "jdbcsqlite3"
           end
+
+          self.options = opt
         end 

[matthewd]

I don't think it even needs to duplicate options; seems that it can safely update the existing options directly, just switching from replace to =.

[y-yagi]

options is a frozen object.
So without dup, will raise RuntimeError(can't modify frozen Thor::CoreExt::HashWithIndifferentAccess).
Ref: rails/thor#446

[matthewd]

Ah, right 👍

[ckoenig]

I changed my PR based on @y-yagi's proposal. Only difference is, that I'm freezing the options again.

[y-yagi]

LGTM. Please squash your commits into a single commit?

[y-yagi]

@ckoenig Thanks!