Merge pull request #10 from openteam/set-username-only-if-necessary

do not use -U username if username not specified
sgruhier · Apr 6, 2013 · 229c2a6 · 229c2a6
2 parents d8d030f + 50497a9
commit 229c2a6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/capistrano-db-tasks/database.rb b/lib/capistrano-db-tasks/database.rb
@@ -15,9 +15,9 @@ def postgresql?
 
     def credentials
       if mysql?
-        " -u #{@config['username']} " + (@config['password'] ? " -p\"#{@config['password']}\" " : '') + (@config['host'] ? " -h #{@config['host']}" : '') + (@config['socket'] ? " -S#{@config['socket']}" : '')
+        (@config['username'] ? " -u #{@config['username']} " : '') + (@config['password'] ? " -p\"#{@config['password']}\" " : '') + (@config['host'] ? " -h #{@config['host']}" : '') + (@config['socket'] ? " -S#{@config['socket']}" : '')
       elsif postgresql?
-        " -U #{@config['username']} " + (@config['host'] ? " -h #{@config['host']}" : '')
+        (@config['username'] ? " -U #{@config['username']} " : '') + (@config['host'] ? " -h #{@config['host']}" : '')
       end
     end