From 551a0272e62133606d34952c309290c3e48c8a61 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Tue, 20 Jun 2006 03:08:48 +0000 Subject: [PATCH] Fixed #2189 -- Optimized auth.User.get_all_permissions() to use select_related behind the scenes to avoid multiple queries. Thanks, konrad@gwu.edu git-svn-id: http://code.djangoproject.com/svn/django/trunk@3162 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- AUTHORS | 1 + django/contrib/auth/models.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 355206b15d..924edf09c3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -74,6 +74,7 @@ answer newbie questions, and generally made Django that much better: Cameron Knight (ckknight) Bruce Kroeze Joseph Kocherhans + konrad@gwu.edu lakin.wecker@gmail.com Stuart Langridge Eugene Lazutkin diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py index 44d7d9ffe8..cfbdca4160 100644 --- a/django/contrib/auth/models.py +++ b/django/contrib/auth/models.py @@ -160,7 +160,7 @@ class User(models.Model): def get_all_permissions(self): if not hasattr(self, '_perm_cache'): import sets - self._perm_cache = sets.Set(["%s.%s" % (p.content_type.app_label, p.codename) for p in self.user_permissions.all()]) + self._perm_cache = sets.Set(["%s.%s" % (p.content_type.app_label, p.codename) for p in self.user_permissions.select_related()]) self._perm_cache.update(self.get_group_permissions()) return self._perm_cache