diff options
author | Ted Strzalkowski <tedski@luciddg.com> | 2015-08-11 18:58:22 +0300 |
---|---|---|
committer | Ted Strzalkowski <tedski@luciddg.com> | 2015-08-12 17:51:24 +0300 |
commit | 7430e7b5fc5d9c24a3d86166153e555e0a3812f1 (patch) | |
tree | 8d66b0f8e7e8be28c44d5b306a73b8140193d494 /lib | |
parent | fed202f6774838d5c5f3fe9b4b31fb03945b6868 (diff) |
Workaround the warnings emitted by MySQL 5.6 regarding password on the
command line.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/backup/database.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/backup/database.rb b/lib/backup/database.rb index bbb230a10f0..939f28fc1c6 100644 --- a/lib/backup/database.rb +++ b/lib/backup/database.rb @@ -18,6 +18,8 @@ module Backup success = case config["adapter"] when /^mysql/ then $progress.print "Dumping MySQL database #{config['database']} ... " + # Workaround warnings from MySQL 5.6 about passwords on cmd line + ENV['MYSQL_PWD'] = config["password"].to_s if config["password"] system('mysqldump', *mysql_args, config['database'], out: db_file_name) when "postgresql" then $progress.print "Dumping PostgreSQL database #{config['database']} ... " @@ -43,6 +45,8 @@ module Backup success = case config["adapter"] when /^mysql/ then $progress.print "Restoring MySQL database #{config['database']} ... " + # Workaround warnings from MySQL 5.6 about passwords on cmd line + ENV['MYSQL_PWD'] = config["password"].to_s if config["password"] system('mysql', *mysql_args, config['database'], in: db_file_name) when "postgresql" then $progress.print "Restoring PostgreSQL database #{config['database']} ... " @@ -69,8 +73,7 @@ module Backup 'port' => '--port', 'socket' => '--socket', 'username' => '--user', - 'encoding' => '--default-character-set', - 'password' => '--password' + 'encoding' => '--default-character-set' } args.map { |opt, arg| "#{arg}=#{config[opt]}" if config[opt] }.compact end |