From 954ae0e510db8c8841b06bf765f252560aea2a10 Mon Sep 17 00:00:00 2001 From: lebaudantoine Date: Mon, 16 Dec 2024 19:48:56 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8(backend)=20fix=20CheckConstraint?= =?UTF-8?q?=20deprecation=20warning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix a deprecation warning from Django, which appears while running tests. 'check' argument is replaced by 'condition'. --- src/backend/core/migrations/0001_initial.py | 4 ++-- src/backend/core/models.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backend/core/migrations/0001_initial.py b/src/backend/core/migrations/0001_initial.py index 38bdb4f3..053d632d 100644 --- a/src/backend/core/migrations/0001_initial.py +++ b/src/backend/core/migrations/0001_initial.py @@ -145,7 +145,7 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='documentaccess', - constraint=models.CheckConstraint(check=models.Q(models.Q(('team', ''), ('user__isnull', False)), models.Q(('team__gt', ''), ('user__isnull', True)), _connector='OR'), name='check_document_access_either_user_or_team', violation_error_message='Either user or team must be set, not both.'), + constraint=models.CheckConstraint(condition=models.Q(models.Q(('team', ''), ('user__isnull', False)), models.Q(('team__gt', ''), ('user__isnull', True)), _connector='OR'), name='check_document_access_either_user_or_team', violation_error_message='Either user or team must be set, not both.'), ), migrations.AddConstraint( model_name='invitation', @@ -161,6 +161,6 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='templateaccess', - constraint=models.CheckConstraint(check=models.Q(models.Q(('team', ''), ('user__isnull', False)), models.Q(('team__gt', ''), ('user__isnull', True)), _connector='OR'), name='check_template_access_either_user_or_team', violation_error_message='Either user or team must be set, not both.'), + constraint=models.CheckConstraint(condition=models.Q(models.Q(('team', ''), ('user__isnull', False)), models.Q(('team__gt', ''), ('user__isnull', True)), _connector='OR'), name='check_template_access_either_user_or_team', violation_error_message='Either user or team must be set, not both.'), ), ] diff --git a/src/backend/core/models.py b/src/backend/core/models.py index b7fb8e79..f558b0b1 100644 --- a/src/backend/core/models.py +++ b/src/backend/core/models.py @@ -695,7 +695,7 @@ class DocumentAccess(BaseAccess): violation_error_message=_("This team is already in this document."), ), models.CheckConstraint( - check=models.Q(user__isnull=False, team="") + condition=models.Q(user__isnull=False, team="") | models.Q(user__isnull=True, team__gt=""), name="check_document_access_either_user_or_team", violation_error_message=_("Either user or team must be set, not both."), @@ -884,7 +884,7 @@ class TemplateAccess(BaseAccess): violation_error_message=_("This team is already in this template."), ), models.CheckConstraint( - check=models.Q(user__isnull=False, team="") + condition=models.Q(user__isnull=False, team="") | models.Q(user__isnull=True, team__gt=""), name="check_template_access_either_user_or_team", violation_error_message=_("Either user or team must be set, not both."),