Do not look for a port in a Unix socket domain path

Contributes to #419

Signed-off-by: Sylvain Hellegouarch <[email protected]>

Author: Lawouach

asyncpg/connect_utils.py

@@ -179,14 +179,19 @@ def _parse_hostlist(hostlist, port):
         port = _validate_port_spec(hostspecs, port)
 
     for i, hostspec in enumerate(hostspecs):
-        addr, _, hostspec_port = hostspec.partition(':')
-        hosts.append(addr)
+        if hostspec.startswith('/'):
+            hosts.append(hostspec)
+            # keep sequence ordering
+            hostlist_ports.append(5432)
+        else:
+            addr, _, hostspec_port = hostspec.partition(':')
+            hosts.append(addr)
 
-        if not port:
-            if hostspec_port:
-                hostlist_ports.append(int(hostspec_port))
-            else:
-                hostlist_ports.append(default_port[i])
+            if not port:
+                if hostspec_port:
+                    hostlist_ports.append(int(hostspec_port))
+                else:
+                    hostlist_ports.append(default_port[i])
 
     if not port:
         port = hostlist_ports

tests/test_connect.py

@@ -475,6 +475,34 @@ class TestConnectParams(tb.TestCase):
                 }
             )
         },
+        {
+            'dsn': 'postgres:///db?host=/cloudsql/'
+                   'project:region:instance-name&user=spam',
+            'result': (
+                [os.path.join(
+                    '/cloudsql/project:region:instance-name',
+                    '.s.PGSQL.5432'
+                )], {
+                    'user': 'spam',
+                    'database': 'db'
+                }
+            )
+        },
+        {
+            'dsn': 'postgres:///db?host=127.0.0.1:5432,/cloudsql/'
+                   'project:region:instance-name,localhost:5433&user=spam',
+            'result': (
+                [('127.0.0.1', 5432),
+                 os.path.join(
+                    '/cloudsql/project:region:instance-name',
+                    '.s.PGSQL.5432'
+                 ),
+                 ('localhost', 5433)], {
+                    'user': 'spam',
+                    'database': 'db'
+                 }
+            )
+        },
     ]
 
     @contextlib.contextmanager