From 71db244491c33a616bd1303db91597aa1472efe5 Mon Sep 17 00:00:00 2001 From: Austin Hyde Date: Sat, 16 Jan 2016 15:14:11 -0500 Subject: [PATCH] Fix behavior of --dbpassword to allow for empty passwords --- lib/DBSteward/dbsteward.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/DBSteward/dbsteward.php b/lib/DBSteward/dbsteward.php index c0a0480..246082d 100755 --- a/lib/DBSteward/dbsteward.php +++ b/lib/DBSteward/dbsteward.php @@ -348,9 +348,14 @@ public function arg_parse() { && strlen($options["dbuser"]) > 0) { $dbuser = $options["dbuser"]; } - if (isset($options['dbpassword']) - && strlen($options['dbpassword']) > 0) { - $this->cli_dbpassword = $options['dbpassword']; + if (isset($options['dbpassword'])) { + if ($options['dbpassword'] === false) { + // treat --dbpassword as the empty password, because + // --dbpassword='' doesn't show up in $options + $this->cli_dbpassword = ''; + } else { + $this->cli_dbpassword = $options['dbpassword']; + } } ///// SQL DDL DML DCL output flags