Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enhance Query String Parsing for Server-Side Binding in Django 4.2 with psycopg 3.1.8+ Resolves #234 #235

Merged
merged 5 commits into from
Dec 9, 2023
Merged

Enhance Query String Parsing for Server-Side Binding in Django 4.2 with psycopg 3.1.8+ Resolves #234 #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aaccdc4
Refactor parsing of query string to handle int, bool, and text types
truongvan Dec 4, 2023
4129612
Testing for parsing of query string to handle int, bool, and text types
truongvan Dec 4, 2023
b52a436
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 4, 2023
d133d1b
support upper-case/title-case variants
truongvan Dec 9, 2023
cec0b29
Use case-insensitive comparison for boolean value
truongvan Dec 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions dj_database_url/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,13 @@ def parse(
options["ssl"] = {"ca": values[-1]}
continue

try:
options[key] = int(values[-1])
except (TypeError, ValueError):
options[key] = values[-1]
value = values[-1]
if value.isdigit():
options[key] = int(value)
elif value.lower() in ("true", "false"):
options[key] = value.lower() == "true"
else:
options[key] = value

if ssl_require:
options["sslmode"] = "require"
Expand Down
15 changes: 15 additions & 0 deletions tests/test_dj_database_url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,21 @@ def test_postgres_parsing_with_special_characters(self):
assert url["PASSWORD"] == "#password"
assert url["PORT"] == 5431

def test_postgres_parsing_with_int_bool_str_query_string(self):
url = "postgres://uf07k1i6d8ia0v:[email protected]:5431/d8r82722r2kuvn?server_side_binding=true&timeout=20&service=my_service&passfile=.my_pgpass"
url = dj_database_url.parse(url)

assert url["ENGINE"] == "django.db.backends.postgresql"
assert url["NAME"] == "d8r82722r2kuvn"
assert url["HOST"] == "ec2-107-21-253-135.compute-1.amazonaws.com"
assert url["USER"] == "uf07k1i6d8ia0v"
assert url["PASSWORD"] == "wegauwhgeuioweg"
assert url["PORT"] == 5431
assert url["OPTIONS"]["server_side_binding"] is True
assert url["OPTIONS"]["timeout"] == 20
assert url["OPTIONS"]["service"] == "my_service"
assert url["OPTIONS"]["passfile"] == ".my_pgpass"

def test_postgis_parsing(self):
url = "postgis://uf07k1i6d8ia0v:[email protected]:5431/d8r82722r2kuvn"
url = dj_database_url.parse(url)
Expand Down