From 6131001215e32673f39b5e3c7c2d415e2c8ec853 Mon Sep 17 00:00:00 2001 From: Andrew Williamson Date: Fri, 8 May 2026 13:18:38 +0100 Subject: [PATCH] update CheckConstraint to use condition kwarg over check --- .../migrations/0001_initial_squashed_0010_cinderreport.py | 2 +- src/olympia/abuse/migrations/0007_auto_20220803_0948.py | 2 +- ...report_just_one_of_guid_and_user_must_be_set_and_more.py | 2 +- ...ort_just_one_of_guid_user_rating_must_be_set_and_more.py | 2 +- src/olympia/abuse/migrations/0027_add_cinderdecision.py | 2 +- ...0057_remove_cinderjob_decision_alter_cinderjob_job_id.py | 2 +- src/olympia/abuse/models.py | 6 +++--- .../0036_alter_needshumanreview_reason_and_more.py | 2 +- src/olympia/reviewers/models.py | 2 +- src/olympia/versions/migrations/0023_auto_20220204_1646.py | 2 +- src/olympia/versions/migrations/0026_auto_20220722_1704.py | 2 +- src/olympia/versions/migrations/0027_auto_20220729_0932.py | 2 +- src/olympia/versions/models.py | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/olympia/abuse/migrations/0001_initial_squashed_0010_cinderreport.py b/src/olympia/abuse/migrations/0001_initial_squashed_0010_cinderreport.py index 2f04c8ff4fd3..de6c8eed3b30 100644 --- a/src/olympia/abuse/migrations/0001_initial_squashed_0010_cinderreport.py +++ b/src/olympia/abuse/migrations/0001_initial_squashed_0010_cinderreport.py @@ -81,7 +81,7 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='abusereport', - constraint=models.CheckConstraint(check=models.Q(models.Q(models.Q(('guid', ''), _negated=True), ('guid__isnull', False), ('user__isnull', True)), models.Q(('guid__isnull', True), ('user__isnull', False)), _connector='OR'), name='just_one_of_guid_and_user_must_be_set'), + constraint=models.CheckConstraint(condition=models.Q(models.Q(models.Q(('guid', ''), _negated=True), ('guid__isnull', False), ('user__isnull', True)), models.Q(('guid__isnull', True), ('user__isnull', False)), _connector='OR'), name='just_one_of_guid_and_user_must_be_set'), ), migrations.AlterField( model_name='abusereport', diff --git a/src/olympia/abuse/migrations/0007_auto_20220803_0948.py b/src/olympia/abuse/migrations/0007_auto_20220803_0948.py index 0a94c7bd594d..4a69b5a5190b 100644 --- a/src/olympia/abuse/migrations/0007_auto_20220803_0948.py +++ b/src/olympia/abuse/migrations/0007_auto_20220803_0948.py @@ -29,6 +29,6 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='abusereport', - constraint=models.CheckConstraint(check=models.Q(models.Q(models.Q(('guid', ''), _negated=True), ('guid__isnull', False), ('user__isnull', True)), models.Q(('guid__isnull', True), ('user__isnull', False)), _connector='OR'), name='just_one_of_guid_and_user_must_be_set'), + constraint=models.CheckConstraint(condition=models.Q(models.Q(models.Q(('guid', ''), _negated=True), ('guid__isnull', False), ('user__isnull', True)), models.Q(('guid__isnull', True), ('user__isnull', False)), _connector='OR'), name='just_one_of_guid_and_user_must_be_set'), ), ] diff --git a/src/olympia/abuse/migrations/0015_remove_abusereport_just_one_of_guid_and_user_must_be_set_and_more.py b/src/olympia/abuse/migrations/0015_remove_abusereport_just_one_of_guid_and_user_must_be_set_and_more.py index dcaa26cda19e..ebe3f1070187 100644 --- a/src/olympia/abuse/migrations/0015_remove_abusereport_just_one_of_guid_and_user_must_be_set_and_more.py +++ b/src/olympia/abuse/migrations/0015_remove_abusereport_just_one_of_guid_and_user_must_be_set_and_more.py @@ -28,7 +28,7 @@ class Migration(migrations.Migration): migrations.AddConstraint( model_name='abusereport', constraint=models.CheckConstraint( - check=models.Q( + condition=models.Q( models.Q( models.Q(('guid', ''), _negated=True), ('guid__isnull', False), diff --git a/src/olympia/abuse/migrations/0016_remove_abusereport_just_one_of_guid_user_rating_must_be_set_and_more.py b/src/olympia/abuse/migrations/0016_remove_abusereport_just_one_of_guid_user_rating_must_be_set_and_more.py index cdf801579c83..a713e7d0e1bc 100644 --- a/src/olympia/abuse/migrations/0016_remove_abusereport_just_one_of_guid_user_rating_must_be_set_and_more.py +++ b/src/olympia/abuse/migrations/0016_remove_abusereport_just_one_of_guid_user_rating_must_be_set_and_more.py @@ -50,7 +50,7 @@ class Migration(migrations.Migration): migrations.AddConstraint( model_name="abusereport", constraint=models.CheckConstraint( - check=models.Q( + condition=models.Q( models.Q( models.Q(("guid", ""), _negated=True), ("collection__isnull", True), diff --git a/src/olympia/abuse/migrations/0027_add_cinderdecision.py b/src/olympia/abuse/migrations/0027_add_cinderdecision.py index 5cb1414d4bac..8bed3087b22d 100644 --- a/src/olympia/abuse/migrations/0027_add_cinderdecision.py +++ b/src/olympia/abuse/migrations/0027_add_cinderdecision.py @@ -58,6 +58,6 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='cinderdecision', - constraint=models.CheckConstraint(check=models.Q(models.Q(('addon__isnull', False), ('collection__isnull', True), ('rating__isnull', True), ('user__isnull', True)), models.Q(('addon__isnull', True), ('collection__isnull', True), ('rating__isnull', True), ('user__isnull', False)), models.Q(('addon__isnull', True), ('collection__isnull', True), ('rating__isnull', False), ('user__isnull', True)), models.Q(('addon__isnull', True), ('collection__isnull', False), ('rating__isnull', True), ('user__isnull', True)), _connector='OR'), name='just_one_of_addon_user_rating_collection_must_be_set'), + constraint=models.CheckConstraint(condition=models.Q(models.Q(('addon__isnull', False), ('collection__isnull', True), ('rating__isnull', True), ('user__isnull', True)), models.Q(('addon__isnull', True), ('collection__isnull', True), ('rating__isnull', True), ('user__isnull', False)), models.Q(('addon__isnull', True), ('collection__isnull', True), ('rating__isnull', False), ('user__isnull', True)), models.Q(('addon__isnull', True), ('collection__isnull', False), ('rating__isnull', True), ('user__isnull', True)), _connector='OR'), name='just_one_of_addon_user_rating_collection_must_be_set'), ), ] diff --git a/src/olympia/abuse/migrations/0057_remove_cinderjob_decision_alter_cinderjob_job_id.py b/src/olympia/abuse/migrations/0057_remove_cinderjob_decision_alter_cinderjob_job_id.py index efef5eff4d6f..87eb2010eb0e 100644 --- a/src/olympia/abuse/migrations/0057_remove_cinderjob_decision_alter_cinderjob_job_id.py +++ b/src/olympia/abuse/migrations/0057_remove_cinderjob_decision_alter_cinderjob_job_id.py @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='cinderjob', - constraint=models.CheckConstraint(check=models.Q(('job_id', ''), _negated=True), name='no_empty_job_id'), + constraint=models.CheckConstraint(condition=models.Q(('job_id', ''), _negated=True), name='no_empty_job_id'), ), migrations.RemoveField( model_name='cinderjob', diff --git a/src/olympia/abuse/models.py b/src/olympia/abuse/models.py index 37b3c838bc4a..4a616f729a4d 100644 --- a/src/olympia/abuse/models.py +++ b/src/olympia/abuse/models.py @@ -102,7 +102,7 @@ class CinderJob(ModelBase): class Meta: constraints = [ - models.CheckConstraint(name='no_empty_job_id', check=~Q(job_id='')) + models.CheckConstraint(name='no_empty_job_id', condition=~Q(job_id='')) ] @property @@ -798,7 +798,7 @@ class Meta: constraints = [ models.CheckConstraint( name='just_one_of_guid_user_rating_collection_must_be_set', - check=( + condition=( # Abuse is against... # a guid models.Q( @@ -1056,7 +1056,7 @@ class Meta: name='just_one_of_addon_user_rating_collection_must_be_set', # Decision is against... # an addon - check=models.Q( + condition=models.Q( addon__isnull=False, user__isnull=True, rating__isnull=True, diff --git a/src/olympia/reviewers/migrations/0036_alter_needshumanreview_reason_and_more.py b/src/olympia/reviewers/migrations/0036_alter_needshumanreview_reason_and_more.py index e6b50b7ad6b3..f239ecf1e7c0 100644 --- a/src/olympia/reviewers/migrations/0036_alter_needshumanreview_reason_and_more.py +++ b/src/olympia/reviewers/migrations/0036_alter_needshumanreview_reason_and_more.py @@ -23,6 +23,6 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='reviewactionreason', - constraint=models.CheckConstraint(check=models.Q(models.Q(('canned_response', ''), _negated=True), models.Q(('canned_block_reason', ''), _negated=True), _connector='OR'), name='either_canned_response_or_canned_block_reason_must_be_set'), + constraint=models.CheckConstraint(condition=models.Q(models.Q(('canned_response', ''), _negated=True), models.Q(('canned_block_reason', ''), _negated=True), _connector='OR'), name='either_canned_response_or_canned_block_reason_must_be_set'), ), ] diff --git a/src/olympia/reviewers/models.py b/src/olympia/reviewers/models.py index 02883e27b0d5..a5a8d16e3e06 100644 --- a/src/olympia/reviewers/models.py +++ b/src/olympia/reviewers/models.py @@ -798,7 +798,7 @@ class Meta: constraints = [ models.CheckConstraint( name='either_canned_response_or_canned_block_reason_must_be_set', - check=( + condition=( ~models.Q(canned_response='') | ~models.Q(canned_block_reason='') ), ) diff --git a/src/olympia/versions/migrations/0023_auto_20220204_1646.py b/src/olympia/versions/migrations/0023_auto_20220204_1646.py index 125a2dbe3beb..c8d900e4998a 100644 --- a/src/olympia/versions/migrations/0023_auto_20220204_1646.py +++ b/src/olympia/versions/migrations/0023_auto_20220204_1646.py @@ -12,6 +12,6 @@ class Migration(migrations.Migration): operations = [ migrations.AddConstraint( model_name='versionreviewerflags', - constraint=models.CheckConstraint(check=models.Q(models.Q(('pending_rejection__isnull', True), ('pending_rejection_by__isnull', True)), ('pending_rejection__isnull', False), _connector='OR'), name='pending_rejection_both_none'), + constraint=models.CheckConstraint(condition=models.Q(models.Q(('pending_rejection__isnull', True), ('pending_rejection_by__isnull', True)), ('pending_rejection__isnull', False), _connector='OR'), name='pending_rejection_both_none'), ), ] diff --git a/src/olympia/versions/migrations/0026_auto_20220722_1704.py b/src/olympia/versions/migrations/0026_auto_20220722_1704.py index 9ac5b5d9e6f0..4ef80575823f 100644 --- a/src/olympia/versions/migrations/0026_auto_20220722_1704.py +++ b/src/olympia/versions/migrations/0026_auto_20220722_1704.py @@ -21,6 +21,6 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='versionreviewerflags', - constraint=models.CheckConstraint(check=models.Q(models.Q(('pending_content_rejection__isnull', True), ('pending_rejection__isnull', True), ('pending_rejection_by__isnull', True)), ('pending_rejection__isnull', False), _connector='OR'), name='pending_rejection_all_none'), + constraint=models.CheckConstraint(condition=models.Q(models.Q(('pending_content_rejection__isnull', True), ('pending_rejection__isnull', True), ('pending_rejection_by__isnull', True)), ('pending_rejection__isnull', False), _connector='OR'), name='pending_rejection_all_none'), ), ] diff --git a/src/olympia/versions/migrations/0027_auto_20220729_0932.py b/src/olympia/versions/migrations/0027_auto_20220729_0932.py index 88bd84cbfcd4..e646c05c405a 100644 --- a/src/olympia/versions/migrations/0027_auto_20220729_0932.py +++ b/src/olympia/versions/migrations/0027_auto_20220729_0932.py @@ -25,6 +25,6 @@ class Migration(migrations.Migration): migrations.RunPython(set_content_rejection_to_false), migrations.AddConstraint( model_name='versionreviewerflags', - constraint=models.CheckConstraint(check=models.Q(models.Q(('pending_content_rejection__isnull', True), ('pending_rejection__isnull', True), ('pending_rejection_by__isnull', True)), models.Q(('pending_content_rejection__isnull', False), ('pending_rejection__isnull', False), ('pending_rejection_by__isnull', False)), _connector='OR'), name='pending_rejection_all_none'), + constraint=models.CheckConstraint(condition=models.Q(models.Q(('pending_content_rejection__isnull', True), ('pending_rejection__isnull', True), ('pending_rejection_by__isnull', True)), models.Q(('pending_content_rejection__isnull', False), ('pending_rejection__isnull', False), ('pending_rejection_by__isnull', False)), _connector='OR'), name='pending_rejection_all_none'), ), ] diff --git a/src/olympia/versions/models.py b/src/olympia/versions/models.py index 4e7b33f0e604..6a75c45c224b 100644 --- a/src/olympia/versions/models.py +++ b/src/olympia/versions/models.py @@ -1176,7 +1176,7 @@ class Meta: constraints = [ models.CheckConstraint( name='pending_rejection_all_none', - check=( + condition=( models.Q( pending_rejection__isnull=True, pending_rejection_by__isnull=True,