aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2008-07-31 09:45:17 +0200
committerMichael Koziarski <michael@koziarski.com>2008-07-31 09:46:40 +0200
commitf64bd2ca85595f94cbbe809f51a52cdb9b68af19 (patch)
treefa6e00ad6a0e9c95248df815e3bf3b7018532c10 /railties
parent2617d0dc5ced4b354bff9633bddafdf80ad5a711 (diff)
downloadrails-f64bd2ca85595f94cbbe809f51a52cdb9b68af19.tar.gz
rails-f64bd2ca85595f94cbbe809f51a52cdb9b68af19.tar.bz2
rails-f64bd2ca85595f94cbbe809f51a52cdb9b68af19.zip
Ensure dbconsole includes the -p parameter to mysql as intended
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/commands/dbconsole.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/commands/dbconsole.rb b/railties/lib/commands/dbconsole.rb
index 17acb7b68f..442526ae32 100644
--- a/railties/lib/commands/dbconsole.rb
+++ b/railties/lib/commands/dbconsole.rb
@@ -41,6 +41,8 @@ when "mysql"
if config['password'] && include_password
args << "--password=#{config['password']}"
+ elsif config['password'] && !config['password'].empty?
+ args << "-p"
end
args << config['database']