github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251

Browse Source 
Use mysql_creation_options inside rescue block
This commit is contained in:
Santiago Pastorino
2011-08-22 10:36:12 -07:00
parent 9d1fc0863b
commit c2ab1b1cc3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/lib/active_record/railties/databases.rake
View File

@@ -94,7 +94,7 @@ db_namespace = namespace :db do
"IDENTIFIED BY '#{config['password']}' WITH GRANT OPTION;"
ActiveRecord::Base.establish_connection(config.merge(
'database' => nil, 'username' => 'root', 'password' => root_password))
ActiveRecord::Base.connection.create_database(config['database'], creation_options)
ActiveRecord::Base.connection.create_database(config['database'], mysql_creation_options(config))
ActiveRecord::Base.connection.execute grant_statement
ActiveRecord::Base.establish_connection(config)
else