diff options
| author | Arthur Nogueira Neves <github@arthurnn.com> | 2015-10-12 15:25:04 -0400 |
|---|---|---|
| committer | Arthur Nogueira Neves <github@arthurnn.com> | 2015-10-12 15:25:04 -0400 |
| commit | 97cdab0680dfa5856f8ec3dfa85e7fafc7f334ae (patch) | |
| tree | d721f57f028b76682efe5161af7600a9facdcd1f /activerecord/Rakefile | |
| parent | 96747036715a658ab21e921919d45d6149949d55 (diff) | |
| parent | 329642325e6d58676c68816ce61db4ea0e8944d3 (diff) | |
| download | rails-97cdab0680dfa5856f8ec3dfa85e7fafc7f334ae.tar.gz rails-97cdab0680dfa5856f8ec3dfa85e7fafc7f334ae.tar.bz2 rails-97cdab0680dfa5856f8ec3dfa85e7fafc7f334ae.zip | |
Merge pull request #21288 from yahonda/mysql_requires_password
Allow mysql and mysql2 tests run by database user with password
Diffstat (limited to 'activerecord/Rakefile')
| -rw-r--r-- | activerecord/Rakefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/Rakefile b/activerecord/Rakefile index 8ea22fd901..c93099a921 100644 --- a/activerecord/Rakefile +++ b/activerecord/Rakefile @@ -88,15 +88,15 @@ namespace :db do desc 'Build the MySQL test databases' task :build do config = ARTest.config['connections']['mysql'] - %x( mysql --user=#{config['arunit']['username']} -e "create DATABASE #{config['arunit']['database']} DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci ") - %x( mysql --user=#{config['arunit2']['username']} -e "create DATABASE #{config['arunit2']['database']} DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci ") + %x( mysql --user=#{config['arunit']['username']} --password=#{config['arunit']['password']} -e "create DATABASE #{config['arunit']['database']} DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci ") + %x( mysql --user=#{config['arunit2']['username']} --password=#{config['arunit2']['password']} -e "create DATABASE #{config['arunit2']['database']} DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci ") end desc 'Drop the MySQL test databases' task :drop do config = ARTest.config['connections']['mysql'] - %x( mysqladmin --user=#{config['arunit']['username']} -f drop #{config['arunit']['database']} ) - %x( mysqladmin --user=#{config['arunit2']['username']} -f drop #{config['arunit2']['database']} ) + %x( mysqladmin --user=#{config['arunit']['username']} --password=#{config['arunit']['password']} -f drop #{config['arunit']['database']} ) + %x( mysqladmin --user=#{config['arunit2']['username']} --password=#{config['arunit2']['password']} -f drop #{config['arunit2']['database']} ) end desc 'Rebuild the MySQL test databases' |