This commit is contained in:
Kenneth Reitz
2011-12-07 11:35:24 -08:00
parent c309a882b2
commit 2cf1925188
+2 -3
View File
@@ -108,10 +108,9 @@ try:
url = urlparse.urlparse(os.environ['DATABASE_URL'])
# Ensure default database exists.
DATABASES['default'] = DATABASES.get('default', {})
DATABASES['default'] = DATABASES.get('default', {})
# We use update here to preserve other keys we
# don't care about (like OPTIONS)
# Update with environment configuration.
DATABASES['default'].update({
'NAME': url.path[1:],
'USER': url.username,