Merge pull request #931 from dbcli/RW/restore-local-socket-option

Restore working local --socket=<UDS>

3 files changed, 4 insertions, 1 deletions

diff --git a/changelog.md b/changelog.md
index 6c54ef7..eedca52 100644
--- a/changelog.md
+++ b/changelog.md
@@ -19,6 +19,7 @@ Bug Fixes:
 * Send "Connecting to socket" message to the standard error.
 * Respect empty string for prompt_continuation via `prompt_continuation = ''` in `.myclirc`
 * Fix \once -o to overwrite output whole, instead of line-by-line.
+* Restore working local `--socket=<UDS>` (Thanks: [xeron]).
 
 1.22.2
 ======
@@ -801,3 +802,4 @@ Bug Fixes:
 [laixintao]: https://github.com/laixintao
 [mtorromeo]: https://github.com/mtorromeo
 [mwcm]: https://github.com/mwcm
+[xeron]: https://github.com/xeron
diff --git a/mycli/AUTHORS b/mycli/AUTHORS
index a5e8d68..c111e4e 100644
--- a/mycli/AUTHORS
+++ b/mycli/AUTHORS
@@ -79,6 +79,7 @@ Contributors:
   * Morgan Mitchell
   * Massimiliano Torromeo
   * Roland Walker
+  * xeron
 
 Creator:
 --------
diff --git a/mycli/main.py b/mycli/main.py
index ade2ca6..c66d048 100755
--- a/mycli/main.py
+++ b/mycli/main.py
@@ -388,7 +388,7 @@ class MyCli(object):
 
         database = database or cnf['database']
         # Socket interface not supported for SSH connections
-        if port or host or ssh_host or ssh_port:
+        if (port and host) or (ssh_host and ssh_port):
             socket = ''
         else:
             socket = socket or cnf['socket'] or guess_socket_location()