Add servicefile as parameter

Author: CommanderKeynes

asyncpg/connect_utils.py

@@ -272,7 +272,8 @@ def _dot_postgresql_path(filename) -> typing.Optional[pathlib.Path]:
 
 
 def _parse_connect_dsn_and_args(*, dsn, host, port, user,
-                                password, passfile, database, ssl, service,
+                                password, passfile, database, ssl,
+                                service, servicefile,
                                 direct_tls, server_settings,
                                 target_session_attrs, krbsrvname, gsslib):
     # `auth_hosts` is the version of host information for the purposes
@@ -297,7 +298,11 @@ def _parse_connect_dsn_and_args(*, dsn, host, port, user,
                 if not service and val:
                     service = val
 
-        connection_service_file = os.getenv('PGSERVICEFILE')
+        connection_service_file = servicefile
+
+        if connection_service_file is None:
+            connection_service_file = os.getenv('PGSERVICEFILE')
+
         if connection_service_file is None:
             homedir = compat.get_pg_home_directory()
             if homedir:
@@ -859,7 +864,7 @@ def _parse_connect_arguments(*, dsn, host, port, user, password, passfile,
                              max_cacheable_statement_size,
                              ssl, direct_tls, server_settings,
                              target_session_attrs, krbsrvname, gsslib,
-                             service):
+                             service, servicefile):
     local_vars = locals()
     for var_name in {'max_cacheable_statement_size',
                      'max_cached_statement_lifetime',
@@ -889,7 +894,8 @@ def _parse_connect_arguments(*, dsn, host, port, user, password, passfile,
         direct_tls=direct_tls, database=database,
         server_settings=server_settings,
         target_session_attrs=target_session_attrs,
-        krbsrvname=krbsrvname, gsslib=gsslib, service=service)
+        krbsrvname=krbsrvname, gsslib=gsslib,
+        service=service, servicefile=servicefile)
 
     config = _ClientConfiguration(
         command_timeout=command_timeout,

asyncpg/connection.py

@@ -2075,6 +2075,7 @@ async def connect(dsn=None, *,
                   host=None, port=None,
                   user=None, password=None, passfile=None,
                   service=None,
+                  servicefile=None,
                   database=None,
                   loop=None,
                   timeout=60,
@@ -2188,6 +2189,10 @@ async def connect(dsn=None, *,
         The name of the postgres connection service stored in the postgres
         connection service file.
 
+    :param servicefile:
+        The location of the connnection service file used to store
+        connection parameters.
+
     :param loop:
         An asyncio event loop instance.  If ``None``, the default
         event loop will be used.
@@ -2400,6 +2405,9 @@ async def connect(dsn=None, *,
     .. versionchanged:: 0.30.0
        Added the *krbsrvname* and *gsslib* parameters.
 
+    .. versionchanged:: 0.31.0
+       Added the *servicefile* and *service* parameters.
+
     .. _SSLContext: https://docs.python.org/3/library/ssl.html#ssl.SSLContext
     .. _create_default_context:
         https://docs.python.org/3/library/ssl.html#ssl.create_default_context
@@ -2434,6 +2442,7 @@ async def connect(dsn=None, *,
             password=password,
             passfile=passfile,
             service=service,
+            servicefile=servicefile,
             ssl=ssl,
             direct_tls=direct_tls,
             database=database,

tests/test_connect.py

@@ -1134,6 +1134,7 @@ def run_testcase(self, testcase):
         krbsrvname = testcase.get('krbsrvname')
         gsslib = testcase.get('gsslib')
         service = testcase.get('service')
+        servicefile = testcase.get('servicefile')
 
         expected = testcase.get('result')
         expected_error = testcase.get('error')
@@ -1159,7 +1160,8 @@ def run_testcase(self, testcase):
                 direct_tls=direct_tls,
                 server_settings=server_settings,
                 target_session_attrs=target_session_attrs,
-                krbsrvname=krbsrvname, gsslib=gsslib, service=service)
+                krbsrvname=krbsrvname, gsslib=gsslib,
+                service=service, servicefile=servicefile)
 
             params = {
                 k: v for k, v in params._asdict().items()