From dbe94cdcd80faa64534e89288b8f20868f48555c Mon Sep 17 00:00:00 2001 From: ranchodeluxe Date: Fri, 7 Jun 2024 12:53:54 -0700 Subject: [PATCH 1/4] show errors --- tests/test_connect.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/test_connect.py b/tests/test_connect.py index 049aea26..5adda336 100644 --- a/tests/test_connect.py +++ b/tests/test_connect.py @@ -563,6 +563,26 @@ class TestConnectParams(tb.TestCase): 'target_session_attrs': 'any'}) }, + #postgresql://eoapi:a2Vw%3Ayk=%29CdSis%5Bfek%5DtW=%2Fo@eoapi-primary.default.svc:5432/eoapi + { + 'name': 'dsn_bad_characters_maybe', + 'env': { + 'PGUSER': 'eoapi', + 'PGDATABASE': 'eoapi', + 'PGPASSWORD': 'a2Vw:yk=)CdSis[fek]tW=/o', + 'PGHOST': 'eoapi-primary.default.svc', + 'PGPORT': '5432', + }, + + 'dsn': 'postgres://eoapi:"a2Vw:yk=)CdSis[fek]tW=/o"@eoapi-primary.default.svc:5432/eoapi', + + 'result': ([('eoapi-primary.default.svc', 5432)], { + 'user': 'eoapi', + 'password': 'a2Vw:yk=)CdSis[fek]tW=/o', + 'database': 'eoapi', + 'ssl': True}) + }, + { 'name': 'params_override_env_and_dsn_ssl_prefer', 'env': { From e0097d85a2a794ecdeb2eec543a09501eb887504 Mon Sep 17 00:00:00 2001 From: ranchodeluxe Date: Fri, 7 Jun 2024 12:58:31 -0700 Subject: [PATCH 2/4] remove comment --- tests/test_connect.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_connect.py b/tests/test_connect.py index 5adda336..dbfb723c 100644 --- a/tests/test_connect.py +++ b/tests/test_connect.py @@ -563,7 +563,6 @@ class TestConnectParams(tb.TestCase): 'target_session_attrs': 'any'}) }, - #postgresql://eoapi:a2Vw%3Ayk=%29CdSis%5Bfek%5DtW=%2Fo@eoapi-primary.default.svc:5432/eoapi { 'name': 'dsn_bad_characters_maybe', 'env': { From e3918874ecfc62f81c4dcc6b0a49852320aa7fb1 Mon Sep 17 00:00:00 2001 From: ranchodeluxe Date: Fri, 7 Jun 2024 14:23:01 -0700 Subject: [PATCH 3/4] quote with urrlib.parse.quote --- tests/test_connect.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/tests/test_connect.py b/tests/test_connect.py index dbfb723c..170215c1 100644 --- a/tests/test_connect.py +++ b/tests/test_connect.py @@ -565,21 +565,15 @@ class TestConnectParams(tb.TestCase): { 'name': 'dsn_bad_characters_maybe', - 'env': { - 'PGUSER': 'eoapi', - 'PGDATABASE': 'eoapi', - 'PGPASSWORD': 'a2Vw:yk=)CdSis[fek]tW=/o', - 'PGHOST': 'eoapi-primary.default.svc', - 'PGPORT': '5432', - }, - - 'dsn': 'postgres://eoapi:"a2Vw:yk=)CdSis[fek]tW=/o"@eoapi-primary.default.svc:5432/eoapi', - + 'dsn': 'postgres://eoapi:a2Vw%3Ayk%3D%29CdSis%5Bfek%5DtW%3D/o@eoapi-primary.default.svc:5432/eoapi', 'result': ([('eoapi-primary.default.svc', 5432)], { 'user': 'eoapi', 'password': 'a2Vw:yk=)CdSis[fek]tW=/o', 'database': 'eoapi', - 'ssl': True}) + 'ssl': True, + 'sslmode': SSLMode.prefer + , + 'target_session_attrs': 'any'}) }, { @@ -1188,6 +1182,7 @@ def test_test_connect_params_run_testcase(self): def test_connect_params(self): for testcase in self.TESTS: + print(testcase) self.run_testcase(testcase) def test_connect_pgpass_regular(self): From c2748d4ebb0539f6d329e24bae4671d164d05c2d Mon Sep 17 00:00:00 2001 From: ranchodeluxe Date: Fri, 7 Jun 2024 16:02:08 -0700 Subject: [PATCH 4/4] quote plus --- tests/test_connect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_connect.py b/tests/test_connect.py index 170215c1..89c4d2bb 100644 --- a/tests/test_connect.py +++ b/tests/test_connect.py @@ -565,7 +565,7 @@ class TestConnectParams(tb.TestCase): { 'name': 'dsn_bad_characters_maybe', - 'dsn': 'postgres://eoapi:a2Vw%3Ayk%3D%29CdSis%5Bfek%5DtW%3D/o@eoapi-primary.default.svc:5432/eoapi', + 'dsn': 'postgres://eoapi:a2Vw%3Ayk%3D%29CdSis%5Bfek%5DtW%3D%2Fo@eoapi-primary.default.svc:5432/eoapi', 'result': ([('eoapi-primary.default.svc', 5432)], { 'user': 'eoapi', 'password': 'a2Vw:yk=)CdSis[fek]tW=/o',