diff options
| author | Yasuo Honda <yasuo.honda@gmail.com> | 2015-08-17 21:29:26 +0000 |
|---|---|---|
| committer | Yasuo Honda <yasuo.honda@gmail.com> | 2015-08-18 12:59:19 +0000 |
| commit | 329642325e6d58676c68816ce61db4ea0e8944d3 (patch) | |
| tree | 96374f66c97330a2d26ee598896f25e97baa308c /activerecord | |
| parent | 2a2473fd71d75bcda68f70500178d32587700ab0 (diff) | |
| download | rails-329642325e6d58676c68816ce61db4ea0e8944d3.tar.gz rails-329642325e6d58676c68816ce61db4ea0e8944d3.tar.bz2 rails-329642325e6d58676c68816ce61db4ea0e8944d3.zip | |
Allow mysql and mysql2 tests run by database user with password
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/Rakefile | 8 | ||||
| -rw-r--r-- | activerecord/test/cases/adapters/mysql/connection_test.rb | 2 |
2 files changed, 5 insertions, 5 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' diff --git a/activerecord/test/cases/adapters/mysql/connection_test.rb b/activerecord/test/cases/adapters/mysql/connection_test.rb index ddbc007b87..2f50b35d53 100644 --- a/activerecord/test/cases/adapters/mysql/connection_test.rb +++ b/activerecord/test/cases/adapters/mysql/connection_test.rb @@ -26,7 +26,7 @@ class MysqlConnectionTest < ActiveRecord::MysqlTestCase run_without_connection do ar_config = ARTest.connection_config['arunit'] - url = "mysql://#{ar_config["username"]}@localhost/#{ar_config["database"]}" + url = "mysql://#{ar_config["username"]}:#{ar_config["password"]}@localhost/#{ar_config["database"]}" Klass.establish_connection(url) assert_equal ar_config['database'], Klass.connection.current_database end |