From f3fc408385491563e1d92003be5e088b1969707b Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Mon, 7 May 2012 10:31:24 +0200
Subject: [PATCH] Get the database name from the routers and dropped support
 for 1.2.X.

---
 .travis.yml                  |  1 -
 dbtemplates/loader.py        | 22 ++++++++++++----------
 dbtemplates/test_settings.py |  1 +
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 30333f5..1803e05 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ before_script:
 script:
   - django-admin.py jenkins dbtemplates
 env:
-  - DJANGO=1.2.7
   - DJANGO=1.3.1
   - DJANGO=1.4
 branches:
diff --git a/dbtemplates/loader.py b/dbtemplates/loader.py
index a2c744d..a467305 100644
--- a/dbtemplates/loader.py
+++ b/dbtemplates/loader.py
@@ -1,7 +1,7 @@
 from django.contrib.sites.models import Site
+from django.db import router
 from django.template import TemplateDoesNotExist
 
-from dbtemplates.conf import settings
 from dbtemplates.models import Template
 from dbtemplates.utils.cache import (cache, get_cache_key,
                                      set_and_return, get_cache_notfound_key)
@@ -19,6 +19,12 @@ class Loader(BaseLoader):
     """
     is_usable = True
 
+    def load_and_store_template(self, template_name, cache_key, site, **params):
+        template = Template.objects.get(name__exact=template_name, **params)
+        db = router.db_for_read(Template, instance=template)
+        display_name = 'dbtemplates:%s:%s:%s' % (db, template_name, site.domain)
+        return set_and_return(cache_key, template.content, display_name)
+
     def load_template_source(self, template_name, template_dirs=None):
         # The logic should work like this:
         # * Try to find the template in the cache. If found, return it.
@@ -33,8 +39,6 @@ class Loader(BaseLoader):
         #   in the cache indicating that queries failed, with the current
         #   timestamp.
         site = Site.objects.get_current()
-        display_name = 'dbtemplates:%s:%s:%s' % (settings.DATABASE_ENGINE,
-                                                 template_name, site.domain)
         cache_key = get_cache_key(template_name)
         if cache:
             try:
@@ -57,15 +61,13 @@ class Loader(BaseLoader):
         # Not marked as not-found, move on...
 
         try:
-            template = Template.objects.get(name__exact=template_name,
-                                            sites__in=[site.id])
-            return set_and_return(cache_key, template.content, display_name)
+            return self.load_and_store_template(template_name, cache_key,
+                                                site, sites__in=[site.id])
         except (Template.MultipleObjectsReturned, Template.DoesNotExist):
             try:
-                template = Template.objects.get(name__exact=template_name,
-                        sites__in=[])
-                return set_and_return(cache_key, template.content, display_name)
-            except Template.DoesNotExist:
+                return self.load_and_store_template(template_name, cache_key,
+                                                    site, sites__in=[])
+            except (Template.MultipleObjectsReturned, Template.DoesNotExist):
                 pass
 
         # Mark as not-found in cache.
diff --git a/dbtemplates/test_settings.py b/dbtemplates/test_settings.py
index 9fb2096..587ebb2 100644
--- a/dbtemplates/test_settings.py
+++ b/dbtemplates/test_settings.py
@@ -6,6 +6,7 @@ SOUTH_TESTS_MIGRATE = False
 
 SITE_ID = 1
 
+SECRET_KEY = 'something-something'
 
 INSTALLED_APPS = [
     'django.contrib.contenttypes',