Merge pull request django-guardian#896 from Natgho/adding-group-and-user-indexes

Improve default indexing, add index comparison tests and fix test timezones

Author: thclark

example_project/settings.py

@@ -60,6 +60,8 @@ def abspath(*args):
 
 USE_I18N = True
 USE_L10N = True
+USE_TZ = True
+TIME_ZONE = "UTC"
 
 LOGIN_REDIRECT_URL = "/"
 

example_project_custom_group/settings.py

@@ -60,6 +60,8 @@ def abspath(*args):
 
 USE_I18N = True
 USE_L10N = True
+USE_TZ = True
+TIME_ZONE = "UTC"
 
 LOGIN_REDIRECT_URL = "/"
 

guardian/migrations/0003_remove_groupobjectpermission_guardian_gr_content_ae6aec_idx_and_more.py

@@ -0,0 +1,41 @@
+# Generated by Django 5.2.5 on 2025-08-28 23:02
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('guardian', '0002_generic_permissions_index'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.RemoveIndex(
+            model_name='groupobjectpermission',
+            name='guardian_gr_content_ae6aec_idx',
+        ),
+        migrations.RemoveIndex(
+            model_name='userobjectpermission',
+            name='guardian_us_content_179ed2_idx',
+        ),
+        migrations.AddIndex(
+            model_name='groupobjectpermission',
+            index=models.Index(fields=['permission', 'group', 'content_type', 'object_pk'], name='guardian_gr_permiss_83545c_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='groupobjectpermission',
+            index=models.Index(fields=['group', 'content_type', 'object_pk'], name='guardian_gr_group_i_9e7d12_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='userobjectpermission',
+            index=models.Index(fields=['permission', 'user', 'content_type', 'object_pk'], name='guardian_us_permiss_e5749c_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='userobjectpermission',
+            index=models.Index(fields=['user', 'content_type', 'object_pk'], name='guardian_us_user_id_8eae14_idx'),
+        ),
+    ]

guardian/models/models.py

@@ -125,6 +125,10 @@ class UserObjectPermission(UserObjectPermissionAbstract):
 
     class Meta(UserObjectPermissionAbstract.Meta):
         abstract = False
+        indexes = [
+            models.Index(fields=["permission", "user", "content_type", "object_pk"]),
+            models.Index(fields=["user", "content_type", "object_pk"]),
+        ]
 
 
 class GroupObjectPermissionBase(BaseObjectPermission):
@@ -186,3 +190,7 @@ class GroupObjectPermission(GroupObjectPermissionAbstract):
 
     class Meta(GroupObjectPermissionAbstract.Meta):
         abstract = False
+        indexes = [
+            models.Index(fields=["permission", "group", "content_type", "object_pk"]),
+            models.Index(fields=["group", "content_type", "object_pk"]),
+        ]

guardian/testapp/migrations/0008_fix_project_timezone.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.5 on 2025-08-28 23:39
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('testapp', '0007_genericgroupobjectpermission'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='project',
+            name='created_at',
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+    ]

guardian/testapp/models.py

@@ -4,6 +4,7 @@
 from django.contrib.admin.models import LogEntry
 from django.contrib.auth.models import AbstractBaseUser, AbstractUser
 from django.db import models
+from django.utils import timezone
 
 from guardian.mixins import GuardianUserMixin
 from guardian.models import GroupObjectPermissionAbstract, GroupObjectPermissionBase, UserObjectPermissionBase
@@ -39,7 +40,7 @@ class Meta(GroupObjectPermissionAbstract.Meta):
 
 class Project(models.Model):
     name = models.CharField(max_length=128, unique=True)
-    created_at = models.DateTimeField(default=datetime.now)
+    created_at = models.DateTimeField(default=timezone.now)
 
     class Meta:
         get_latest_by = "created_at"