Merge 71db244 into 95ac6cc

dbsteward · Jan 16, 2016 · eda9f9e · eda9f9e
2 parents 95ac6cc + 71db244
commit eda9f9e
Showing 1 changed file with 8 additions and 3 deletions.
diff --git 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