Hopiu/dj-database-url
1
0
Fork 0
mirror of https://github.com/jazzband/dj-database-url.git synced 2026-03-16 22:20:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove scope name shadow (#169)

Browse source
This commit is contained in:
Matt Seymour 2022-05-29 10:33:52 +01:00 committed by GitHub
parent aba6a67d51
commit 389febf692
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dj_database_url.py
View file

@ -60,15 +60,12 @@ def config(
env=DEFAULT_ENV, default=None, engine=None, conn_max_age=0, ssl_require=False
):
"""Returns configured DATABASE dictionary from DATABASE_URL."""
config = {}
s = os.environ.get(env, default)
if s:
config = parse(s, engine, conn_max_age, ssl_require)
return parse(s, engine, conn_max_age, ssl_require)
return config
return {}
def parse(url, engine=None, conn_max_age=0, ssl_require=False):
@ -82,7 +79,7 @@ def parse(url, engine=None, conn_max_age=0, ssl_require=False):
# note: no other settings are required for sqlite
# otherwise parse the url as normal
config = {}
parsed_config = {}
url = urlparse.urlparse(url)
@ -121,7 +118,7 @@ def parse(url, engine=None, conn_max_age=0, ssl_require=False):
)
# Update with environment configuration.
config.update(
parsed_config.update(
{
"NAME": urlparse.unquote(path or ""),
"USER": urlparse.unquote(url.username or ""),
@ -154,9 +151,9 @@ def parse(url, engine=None, conn_max_age=0, ssl_require=False):
options["options"] = "-c search_path={0}".format(options.pop("currentSchema"))
if options:
config["OPTIONS"] = options
parsed_config["OPTIONS"] = options
if engine:
config["ENGINE"] = engine
parsed_config["ENGINE"] = engine
return config
return parsed_config