Merge f6e0fa9 into 315a33c

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 * Python 3.2 and 3.4 support
 * Improved test suite - 100% coverage + flake8
+* Multiple database support - `TEST_DATABASE_URL` will create `settings.DATABASES['test']`
 
 ## 1.2
 

README.rst

@@ -132,6 +132,10 @@ Uses
 `dj-database-url <https://github.com/kennethreitz/dj-database-url>`__ -
 parses ``DATABASE_URL`` if it exists, otherwise falls back to in-memory sqlite.
 
+Anything of the form ``FOO_DATABASE_URL`` will be parsed as
+``DATABASES['foo']``, allowing you to configure multiple databases via the
+environment.
+
 ``ALLOWED_HOSTS``
 ~~~~~~~~~~~~~~~~~
 

django12factor/__init__.py

@@ -73,6 +73,14 @@ def factorise(custom_settings=None):
         'default': dj_database_url.config(default='sqlite://:memory:')
     }
 
+    for (potential_database_url, value) in os.environ.iteritems():
+        _SUFFIX = "_DATABASE_URL"
+        _OFFSET = len(_SUFFIX)
+        if potential_database_url.endswith(_SUFFIX):
+            dbname = potential_database_url[:-_OFFSET].lower()
+            db = dj_database_url.parse(os.environ[potential_database_url])
+            settings['DATABASES'][dbname] = db
+
     settings['DEBUG'] = getenv_bool('DEBUG')
     if 'TEMPLATE_DEBUG' in os.environ:
         settings['TEMPLATE_DEBUG'] = getenv_bool('TEMPLATE_DEBUG')

tests/test_d12f.py

@@ -65,3 +65,23 @@ def test_missing_custom_keys(self):
             settings = d12f(['PRESENT', 'MISSING'])
             self.assertEquals(present, settings['PRESENT'])
             self.assertIsNone(settings['MISSING'])
+
+    def test_multiple_db_support(self):
+        DBNAME = "test"
+        DB_URL_NAME = "%s_DATABASE_URL" % DBNAME.upper()
+        e = {DB_URL_NAME: "postgres://username:password@host:1234/dbname"}
+
+        with debugenv(**e):
+            dbs = d12f()['DATABASES']
+            self.assertIn(
+                'sqlite',
+                dbs['default']['ENGINE'],
+                "Failed to load default DATABASE"
+            )
+            self.assertIn(
+                DBNAME,
+                dbs,
+                "Failed to parse a database called '%s' from the environment "
+                "variable %s" % (DBNAME, DB_URL_NAME)
+            )
+            self.assertIn('postgres', dbs[DBNAME]['ENGINE'])