@@ -485,32 +485,48 @@ def _parse_connect_dsn_and_args(*, dsn, host, port, user,
485485 ssl = val
486486
487487 if 'sslcert' in service_params :
488- sslcert = service_params .pop ('sslcert' )
488+ val = service_params .pop ('sslcert' )
489+ if sslcert is None :
490+ sslcert = val
489491
490492 if 'sslkey' in service_params :
491- sslkey = service_params .pop ('sslkey' )
493+ val = service_params .pop ('sslkey' )
494+ if sslkey is None :
495+ sslkey = val
492496
493497 if 'sslrootcert' in service_params :
494- sslrootcert = service_params .pop ('sslrootcert' )
498+ val = service_params .pop ('sslrootcert' )
499+ if sslrootcert is None :
500+ sslrootcert = val
495501
496502 if 'sslnegotiation' in service_params :
497- sslnegotiation = service_params .pop ('sslnegotiation' )
503+ val = service_params .pop ('sslnegotiation' )
504+ if sslnegotiation is None :
505+ sslnegotiation = val
498506
499507 if 'sslcrl' in service_params :
500- sslcrl = service_params .pop ('sslcrl' )
508+ val = service_params .pop ('sslcrl' )
509+ if sslcrl is None :
510+ sslcrl = val
501511
502512 if 'sslpassword' in service_params :
503- sslpassword = service_params .pop ('sslpassword' )
513+ val = service_params .pop ('sslpassword' )
514+ if sslpassword is None :
515+ sslpassword = val
504516
505517 if 'ssl_min_protocol_version' in service_params :
506- ssl_min_protocol_version = service_params .pop (
518+ val = service_params .pop (
507519 'ssl_min_protocol_version'
508520 )
521+ if ssl_min_protocol_version is None :
522+ ssl_min_protocol_version = val
509523
510524 if 'ssl_max_protocol_version' in service_params :
511- ssl_max_protocol_version = service_params .pop (
525+ val = service_params .pop (
512526 'ssl_max_protocol_version'
513527 )
528+ if ssl_max_protocol_version is None :
529+ ssl_max_protocol_version = val
514530
515531 if 'target_session_attrs' in service_params :
516532 dsn_target_session_attrs = service_params .pop (
0 commit comments