use prefetch if django version > 1.4 and updated tests

gnunicorn · Apr 19, 2012 · 1549809 · 1549809
1 parent b0b6382
commit 1549809
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/actstream/gfk.py b/actstream/gfk.py
@@ -1,3 +1,4 @@
+import django
 from django.conf import settings
 from django.db.models import Manager
 from django.db.models.query import QuerySet, EmptyQuerySet
@@ -6,7 +7,8 @@
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.generic import GenericForeignKey
 
-USE_PREFETCH = getattr(settings, 'USE_PREFETCH', False)
+USE_PREFETCH = getattr(settings, 'USE_PREFETCH',
+                       django.VERSION[0] == 1 and django.VERSION[1] >= 4)
 FETCH_RELATIONS = getattr(settings, 'FETCH_RELATIONS', True)
 
 

diff --git a/actstream/tests.py b/actstream/tests.py
@@ -16,6 +16,17 @@
 from actstream.signals import action
 from actstream import settings as actstream_settings
 
+class LTE(int):
+    def __new__(cls, n):
+        obj = super(LTE, cls).__new__(cls, n)
+        obj.n = n
+        return obj
+
+    def __eq__(self, other):
+        return other <= self.n
+
+    def __repr__(self):
+        return "<= %s" % self.n
 
 class ActivityBaseTestCase(TestCase):
     actstream_models = ()
@@ -331,9 +342,9 @@ def test_fetch_generic_relations(self):
         n = actions().count()
 
         # compare to fetching only 1 generic relation
-        self.assertNumQueries(n + 1,
+        self.assertNumQueries(LTE(n + 1),
             lambda: [a.target for a in actions()])
-        self.assertNumQueries(num_content_types + 2,
+        self.assertNumQueries(LTE(num_content_types + 2),
             lambda: [a.target for a in
                 actions().fetch_generic_relations('target')])
 
@@ -345,9 +356,9 @@ def test_fetch_generic_relations(self):
         # compare to fetching all generic relations
         num_content_types = len(set(sum(actions().values_list(
             'actor_content_type_id', 'target_content_type_id'), ())))
-        self.assertNumQueries(2 * n + 1,
+        self.assertNumQueries(LTE(2 * n + 1),
             lambda: [(a.actor, a.target) for a in actions()])
-        self.assertNumQueries(num_content_types + 2,
+        self.assertNumQueries(LTE(num_content_types + 2),
             lambda: [(a.actor, a.target) for a in
                 actions().fetch_generic_relations()])
 
@@ -359,7 +370,7 @@ def test_fetch_generic_relations(self):
             action_actor_targets_fetch_generic_all)
 
         # fetch only 1 generic relation, but access both gfks
-        self.assertNumQueries(n + num_content_types + 2,
+        self.assertNumQueries(LTE(n + num_content_types + 2),
             lambda: [(a.actor, a.target) for a in
                 actions().fetch_generic_relations('target')])
         action_actor_targets_fetch_generic_target = [

diff --git a/example_project/settings.py b/example_project/settings.py
@@ -124,7 +124,7 @@ def user_override(user):
 
 FETCH_RELATIONS = True
 
-USE_PREFETCH = False
+USE_PREFETCH = True
 
 DEBUG_TOOLBAR_PANELS = (
     'debug_toolbar.panels.template.TemplateDebugPanel',
@@ -134,4 +134,4 @@ def user_override(user):
 
 DEBUG_TOOLBAR_CONFIG = {
     'INTERCEPT_REDIRECTS': False,
-}
+}