Update to use Django-environ

syrusakbary · syrusakbary · commit 8df8dfe0c3f6 · 2016-04-06T22:18:03.000-07:00
diff --git a/requirements_base.txt b/requirements_base.txt
@@ -2,3 +2,4 @@ Django==1.9.2
 graphene[django]==0.7.3
 django-graphiql==0.4.4
 django-filter==0.12.0
+django-environ==0.4.0
diff --git a/swapi_graphene/settings.py b/swapi_graphene/settings.py
@@ -138,29 +138,21 @@
 # Change the database setup if we have DB environment
 # vars. Useful for Heroku/Dokku databases
 
-DB_NAME = os.environ.get('DB_NAME')
-DB_HOST = os.environ.get('DB_HOST')
-DB_USER = os.environ.get('DB_USER')
-DB_PASSWORD = os.environ.get('DB_PASS')
-DB_PORT = os.environ.get('DB_PORT')
+DATABASE_URL = os.environ.get('DATABASE_URL')
+
+if DATABASE_URL:
+    import environ
+    env = environ.Env()
 
-if DB_NAME and DB_HOST and DB_USER:
     DATABASES = {
-        'default': {
-            'ENGINE': 'django.db.backends.mysql',
-            'NAME': DB_NAME,
-            'HOST': DB_HOST,
-            'USER': DB_USER,
-            'PASSWORD': DB_PASSWORD,
-            'PORT': DB_PORT,
+        'default': dict({
             'OPTIONS': {
-                'init_command': 'SET storage_engine=InnoDB',
                 'charset': 'utf8',
                 'use_unicode': True,
             },
             'TEST_CHARSET': 'utf8',
             'TEST_COLLATION': 'utf8_general_ci',
-        }
+        }, **env.db())
     }
 
 GRAPHENE_SCHEMA = 'starwars.schema'
