From fcf0ccde53a7a27bffe2b678ce16e462d9f7a354 Mon Sep 17 00:00:00 2001
From: Rodolfo Carvalho <rhcarvalho@gmail.com>
Date: Fri, 22 May 2015 15:34:11 +0200
Subject: [PATCH] Fix database config

---
 application-template.json | 12 ++++++++++--
 project/settings.py       | 24 ++++++++++++++++++------
 requirements.txt          |  1 -
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/application-template.json b/application-template.json
index 2ec26f40..6df6aa1e 100644
--- a/application-template.json
+++ b/application-template.json
@@ -173,8 +173,16 @@
                     "value": "${DJANGO_SECRET_KEY}"
                   },
                   {
-                    "name": "DATABASE_URL",
-                    "value": "postgres://${DATABASE_USER}:${DATABASE_PASSWORD}@$DATABASE_SERVICE_HOST:$DATABASE_SERVICE_PORT/${DATABASE_NAME}"
+                    "name": "DATABASE_USER",
+                    "value": "${DATABASE_USER}"
+                  },
+                  {
+                    "name": "DATABASE_PASSWORD",
+                    "value": "${DATABASE_PASSWORD}"
+                  },
+                  {
+                    "name": "DATABASE_NAME",
+                    "value": "${DATABASE_NAME}"
                   }
                 ]
               }
diff --git a/project/settings.py b/project/settings.py
index 3194307a..48d6df73 100644
--- a/project/settings.py
+++ b/project/settings.py
@@ -12,7 +12,6 @@ https://docs.djangoproject.com/en/1.8/ref/settings/
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
-import dj_database_url
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
@@ -80,11 +79,24 @@ WSGI_APPLICATION = 'project.wsgi.application'
 # Database
 # https://docs.djangoproject.com/en/1.8/ref/settings/#databases
 
-DATABASES = {
-    'default': dj_database_url.config(
-        default='sqlite:///'+os.path.join(BASE_DIR, 'db.sqlite3')
-    )
-}
+if os.getenv("DATABASE_SERVICE_HOST"):
+    DATABASES = {
+        'default': {
+            'ENGINE': 'django.db.backends.postgresql_psycopg2',
+            'NAME': os.getenv("DATABASE_NAME"),
+            'USER': os.getenv("DATABASE_USER"),
+            'PASSWORD': os.getenv("DATABASE_PASSWORD"),
+            'HOST': os.getenv("DATABASE_SERVICE_HOST"),
+            'PORT': os.getenv("DATABASE_SERVICE_PORT"),
+        }
+    }
+else:
+    DATABASES = {
+        'default': {
+            'ENGINE': 'django.db.backends.sqlite3',
+            'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        }
+    }
 
 
 # Internationalization
diff --git a/requirements.txt b/requirements.txt
index a49504ef..f68902b0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,3 @@ Django==1.8.1
 psycopg2==2.6
 gunicorn==19.3.0
 whitenoise==1.0.6
-dj-database-url==0.3.0