Merge branch 'main' into include-metricity-db-creation-for-local-setup

Author: kosayoda

pydis_site/apps/api/tests/test_infractions.py

@@ -664,7 +664,10 @@ def test_unique_constraint_accepts_active_infractions_for_different_users(self):
         )
 
     def test_integrity_error_if_missing_active_field(self):
-        pattern = 'null value in column "active" violates not-null constraint'
+        pattern = (
+            'null value in column "active" (of relation "api_infraction" )?'
+            'violates not-null constraint'
+        )
         with self.assertRaisesRegex(IntegrityError, pattern):
             Infraction.objects.create(
                 user=self.user,