From 85d7019c14b5843be091172cc41c007d06e08feb Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Wed, 4 Sep 2024 17:30:27 +0530 Subject: [PATCH] [chores] Updated index_together constraint `index_together` is deprecated from Django 4.2 --- openwisp_users/base/models.py | 4 +++- ...21_rename_user_id_email_user_id_email_idx.py | 17 +++++++++++++++++ .../sample_users/migrations/0001_initial.py | 5 ++++- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 openwisp_users/migrations/0021_rename_user_id_email_user_id_email_idx.py diff --git a/openwisp_users/base/models.py b/openwisp_users/base/models.py index b654c173..f80db7b6 100644 --- a/openwisp_users/base/models.py +++ b/openwisp_users/base/models.py @@ -73,7 +73,9 @@ class AbstractUser(BaseUser): class Meta(BaseUser.Meta): abstract = True - index_together = ('id', 'email') + indexes = [ + models.Index(name='user_id_email_idx', fields=['id', 'email']), + ] @staticmethod def _get_pk(obj): diff --git a/openwisp_users/migrations/0021_rename_user_id_email_user_id_email_idx.py b/openwisp_users/migrations/0021_rename_user_id_email_user_id_email_idx.py new file mode 100644 index 00000000..ab34e7b7 --- /dev/null +++ b/openwisp_users/migrations/0021_rename_user_id_email_user_id_email_idx.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.16 on 2024-09-04 12:00 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("openwisp_users", "0020_populate_password_updated_field"), + ] + + operations = [ + migrations.RenameIndex( + model_name="user", + new_name="user_id_email_idx", + old_fields=("id", "email"), + ), + ] diff --git a/tests/openwisp2/sample_users/migrations/0001_initial.py b/tests/openwisp2/sample_users/migrations/0001_initial.py index f868a639..52fde43a 100644 --- a/tests/openwisp2/sample_users/migrations/0001_initial.py +++ b/tests/openwisp2/sample_users/migrations/0001_initial.py @@ -199,7 +199,6 @@ class Migration(migrations.Migration): 'verbose_name': 'user', 'verbose_name_plural': 'users', 'abstract': False, - 'index_together': {('id', 'email')}, }, managers=[ ('objects', openwisp_users.base.models.UserManager()), @@ -500,4 +499,8 @@ class Migration(migrations.Migration): to=settings.AUTH_USER_MODEL, ), ), + migrations.AddIndex( + model_name="user", + index=models.Index(fields=["id", "email"], name="user_id_email_idx"), + ), ]