summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Hagander2020-04-01 19:12:55 +0000
committerMagnus Hagander2020-04-01 19:33:29 +0000
commit34244d8f895c2876b997e36c8115b4533f5b0e9f (patch)
tree7f7c1508d553c19a5e0c028773204874756cffa5
parent7a3257f1b014c8a5efc7e329462b063b6009cf3a (diff)
Set on_delete=models.CASCADE on all relations
-rw-r--r--pgcommitfest/commitfest/migrations/0001_initial.py20
-rw-r--r--pgcommitfest/commitfest/migrations/0002_notifications.py4
-rw-r--r--pgcommitfest/commitfest/models.py26
-rw-r--r--pgcommitfest/userprofile/migrations/0001_initial.py6
-rw-r--r--pgcommitfest/userprofile/migrations/0002_notifications.py4
-rw-r--r--pgcommitfest/userprofile/models.py8
6 files changed, 34 insertions, 34 deletions
diff --git a/pgcommitfest/commitfest/migrations/0001_initial.py b/pgcommitfest/commitfest/migrations/0001_initial.py
index 39a382a..a0a3db0 100644
--- a/pgcommitfest/commitfest/migrations/0001_initial.py
+++ b/pgcommitfest/commitfest/migrations/0001_initial.py
@@ -31,7 +31,7 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Committer',
fields=[
- ('user', models.OneToOneField(primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL)),
+ ('user', models.OneToOneField(primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
('active', models.BooleanField(default=True)),
],
options={
@@ -65,8 +65,8 @@ class Migration(migrations.Migration):
('mailsubject', models.CharField(max_length=500)),
('maildate', models.DateTimeField()),
('mailauthor', models.CharField(max_length=500)),
- ('mailthread', models.ForeignKey(to='commitfest.MailThread')),
- ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+ ('mailthread', models.ForeignKey(to='commitfest.MailThread', on_delete=models.CASCADE)),
+ ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
],
options={
'ordering': ('date',),
@@ -82,7 +82,7 @@ class Migration(migrations.Migration):
('date', models.DateTimeField()),
('author', models.CharField(max_length=500)),
('ispatch', models.NullBooleanField()),
- ('mailthread', models.ForeignKey(to='commitfest.MailThread')),
+ ('mailthread', models.ForeignKey(to='commitfest.MailThread', on_delete=models.CASCADE)),
],
options={
'ordering': ('-date',),
@@ -111,8 +111,8 @@ class Migration(migrations.Migration):
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('date', models.DateTimeField(auto_now_add=True)),
('what', models.CharField(max_length=500)),
- ('by', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
- ('patch', models.ForeignKey(to='commitfest.Patch')),
+ ('by', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
+ ('patch', models.ForeignKey(to='commitfest.Patch', on_delete=models.CASCADE)),
],
options={
'ordering': ('-date',),
@@ -125,8 +125,8 @@ class Migration(migrations.Migration):
('enterdate', models.DateTimeField()),
('leavedate', models.DateTimeField(null=True, blank=True)),
('status', models.IntegerField(default=1, choices=[(1, 'Needs review'), (2, 'Waiting on Author'), (3, 'Ready for Committer'), (4, 'Committed'), (5, 'Moved to next CF'), (6, 'Rejected'), (7, 'Returned with feedback')])),
- ('commitfest', models.ForeignKey(to='commitfest.CommitFest')),
- ('patch', models.ForeignKey(to='commitfest.Patch')),
+ ('commitfest', models.ForeignKey(to='commitfest.CommitFest', on_delete=models.CASCADE)),
+ ('patch', models.ForeignKey(to='commitfest.Patch', on_delete=models.CASCADE)),
],
options={
'ordering': ('-commitfest__startdate',),
@@ -155,7 +155,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='patch',
name='committer',
- field=models.ForeignKey(blank=True, to='commitfest.Committer', null=True),
+ field=models.ForeignKey(blank=True, to='commitfest.Committer', null=True, on_delete=models.CASCADE),
),
migrations.AddField(
model_name='patch',
@@ -165,7 +165,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='patch',
name='topic',
- field=models.ForeignKey(to='commitfest.Topic'),
+ field=models.ForeignKey(to='commitfest.Topic', on_delete=models.CASCADE),
),
migrations.AddField(
model_name='mailthread',
diff --git a/pgcommitfest/commitfest/migrations/0002_notifications.py b/pgcommitfest/commitfest/migrations/0002_notifications.py
index b94daed..7fc2396 100644
--- a/pgcommitfest/commitfest/migrations/0002_notifications.py
+++ b/pgcommitfest/commitfest/migrations/0002_notifications.py
@@ -17,8 +17,8 @@ class Migration(migrations.Migration):
name='PendingNotification',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('history', models.ForeignKey(to='commitfest.PatchHistory')),
- ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+ ('history', models.ForeignKey(to='commitfest.PatchHistory', on_delete=models.CASCADE)),
+ ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
],
),
migrations.AddField(
diff --git a/pgcommitfest/commitfest/models.py b/pgcommitfest/commitfest/models.py
index f061ff2..3b7049a 100644
--- a/pgcommitfest/commitfest/models.py
+++ b/pgcommitfest/commitfest/models.py
@@ -12,7 +12,7 @@ from pgcommitfest.userprofile.models import UserProfile
# need to extend from the user model, so just create a separate
# class.
class Committer(models.Model):
- user = models.OneToOneField(User, null=False, blank=False, primary_key=True)
+ user = models.OneToOneField(User, null=False, blank=False, primary_key=True, on_delete=models.CASCADE)
active = models.BooleanField(null=False, blank=False, default=True)
def __str__(self):
@@ -87,7 +87,7 @@ class TargetVersion(models.Model):
class Patch(models.Model, DiffableModel):
name = models.CharField(max_length=500, blank=False, null=False, verbose_name='Description')
- topic = models.ForeignKey(Topic, blank=False, null=False)
+ topic = models.ForeignKey(Topic, blank=False, null=False, on_delete=models.CASCADE)
# One patch can be in multiple commitfests, if it has history
commitfests = models.ManyToManyField(CommitFest, through='PatchOnCommitFest')
@@ -99,12 +99,12 @@ class Patch(models.Model, DiffableModel):
gitlink = models.URLField(blank=True, null=False, default='')
# Version targeted by this patch
- targetversion = models.ForeignKey(TargetVersion, blank=True, null=True, verbose_name="Target version")
+ targetversion = models.ForeignKey(TargetVersion, blank=True, null=True, verbose_name="Target version", on_delete=models.CASCADE)
authors = models.ManyToManyField(User, related_name='patch_author', blank=True)
reviewers = models.ManyToManyField(User, related_name='patch_reviewer', blank=True)
- committer = models.ForeignKey(Committer, blank=True, null=True)
+ committer = models.ForeignKey(Committer, blank=True, null=True, on_delete=models.CASCADE)
# Users to be notified when something happens
subscribers = models.ManyToManyField(User, related_name='patch_subscriber', blank=True)
@@ -201,8 +201,8 @@ class PatchOnCommitFest(models.Model):
def OPEN_STATUS_CHOICES(cls):
return [x for x in cls._STATUS_CHOICES if x[0] in cls.OPEN_STATUSES]
- patch = models.ForeignKey(Patch, blank=False, null=False)
- commitfest = models.ForeignKey(CommitFest, blank=False, null=False)
+ patch = models.ForeignKey(Patch, blank=False, null=False, on_delete=models.CASCADE)
+ commitfest = models.ForeignKey(CommitFest, blank=False, null=False, on_delete=models.CASCADE)
enterdate = models.DateTimeField(blank=False, null=False)
leavedate = models.DateTimeField(blank=True, null=True)
@@ -222,9 +222,9 @@ class PatchOnCommitFest(models.Model):
class PatchHistory(models.Model):
- patch = models.ForeignKey(Patch, blank=False, null=False)
+ patch = models.ForeignKey(Patch, blank=False, null=False, on_delete=models.CASCADE)
date = models.DateTimeField(blank=False, null=False, auto_now_add=True, db_index=True)
- by = models.ForeignKey(User, blank=False, null=False)
+ by = models.ForeignKey(User, blank=False, null=False, on_delete=models.CASCADE)
what = models.CharField(max_length=500, null=False, blank=False)
@property
@@ -301,7 +301,7 @@ class MailThread(models.Model):
class MailThreadAttachment(models.Model):
- mailthread = models.ForeignKey(MailThread, null=False, blank=False)
+ mailthread = models.ForeignKey(MailThread, null=False, blank=False, on_delete=models.CASCADE)
messageid = models.CharField(max_length=1000, null=False, blank=False)
attachmentid = models.IntegerField(null=False, blank=False)
filename = models.CharField(max_length=1000, null=False, blank=True)
@@ -315,9 +315,9 @@ class MailThreadAttachment(models.Model):
class MailThreadAnnotation(models.Model):
- mailthread = models.ForeignKey(MailThread, null=False, blank=False)
+ mailthread = models.ForeignKey(MailThread, null=False, blank=False, on_delete=models.CASCADE)
date = models.DateTimeField(null=False, blank=False, auto_now_add=True)
- user = models.ForeignKey(User, null=False, blank=False)
+ user = models.ForeignKey(User, null=False, blank=False, on_delete=models.CASCADE)
msgid = models.CharField(max_length=1000, null=False, blank=False)
annotationtext = models.TextField(null=False, blank=False, max_length=2000)
mailsubject = models.CharField(max_length=500, null=False, blank=False)
@@ -339,5 +339,5 @@ class PatchStatus(models.Model):
class PendingNotification(models.Model):
- history = models.ForeignKey(PatchHistory, blank=False, null=False)
- user = models.ForeignKey(User, blank=False, null=False)
+ history = models.ForeignKey(PatchHistory, blank=False, null=False, on_delete=models.CASCADE)
+ user = models.ForeignKey(User, blank=False, null=False, on_delete=models.CASCADE)
diff --git a/pgcommitfest/userprofile/migrations/0001_initial.py b/pgcommitfest/userprofile/migrations/0001_initial.py
index 532bd00..399d26f 100644
--- a/pgcommitfest/userprofile/migrations/0001_initial.py
+++ b/pgcommitfest/userprofile/migrations/0001_initial.py
@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
('confirmed', models.BooleanField(default=False)),
('token', models.CharField(max_length=100, blank=True)),
('tokensent', models.DateTimeField()),
- ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+ ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
],
options={
'ordering': ('user', 'email'),
@@ -30,8 +30,8 @@ class Migration(migrations.Migration):
name='UserProfile',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('selectedemail', models.ForeignKey(verbose_name='Sender email', blank=True, to='userprofile.UserExtraEmail', null=True)),
- ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+ ('selectedemail', models.ForeignKey(verbose_name='Sender email', blank=True, to='userprofile.UserExtraEmail', null=True, on_delete=models.CASCADE)),
+ ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
],
),
migrations.AlterUniqueTogether(
diff --git a/pgcommitfest/userprofile/migrations/0002_notifications.py b/pgcommitfest/userprofile/migrations/0002_notifications.py
index 75e2cc5..7926045 100644
--- a/pgcommitfest/userprofile/migrations/0002_notifications.py
+++ b/pgcommitfest/userprofile/migrations/0002_notifications.py
@@ -30,11 +30,11 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='userprofile',
name='notifyemail',
- field=models.ForeignKey(related_name='notifier', verbose_name='Notifications sent to', blank=True, to='userprofile.UserExtraEmail', null=True),
+ field=models.ForeignKey(related_name='notifier', verbose_name='Notifications sent to', blank=True, to='userprofile.UserExtraEmail', null=True, on_delete=models.CASCADE),
),
migrations.AlterField(
model_name='userprofile',
name='user',
- field=models.OneToOneField(to=settings.AUTH_USER_MODEL),
+ field=models.OneToOneField(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
),
]
diff --git a/pgcommitfest/userprofile/models.py b/pgcommitfest/userprofile/models.py
index 6d450a5..ea1cae9 100644
--- a/pgcommitfest/userprofile/models.py
+++ b/pgcommitfest/userprofile/models.py
@@ -3,7 +3,7 @@ from django.contrib.auth.models import User
class UserExtraEmail(models.Model):
- user = models.ForeignKey(User, null=False, blank=False, db_index=True)
+ user = models.ForeignKey(User, null=False, blank=False, db_index=True, on_delete=models.CASCADE)
email = models.EmailField(max_length=100, null=False, blank=False, unique=True)
confirmed = models.BooleanField(null=False, blank=False, default=False)
token = models.CharField(max_length=100, null=False, blank=True)
@@ -18,12 +18,12 @@ class UserExtraEmail(models.Model):
class UserProfile(models.Model):
- user = models.OneToOneField(User, null=False, blank=False)
+ user = models.OneToOneField(User, null=False, blank=False, on_delete=models.CASCADE)
selectedemail = models.ForeignKey(UserExtraEmail, null=True, blank=True,
- verbose_name='Sender email')
+ verbose_name='Sender email', on_delete=models.CASCADE)
notifyemail = models.ForeignKey(UserExtraEmail, null=True, blank=True,
verbose_name='Notifications sent to',
- related_name='notifier')
+ related_name='notifier', on_delete=models.CASCADE)
notify_all_author = models.BooleanField(null=False, blank=False, default=False, verbose_name="Notify on all where author")
notify_all_reviewer = models.BooleanField(null=False, blank=False, default=False, verbose_name="Notify on all where reviewer")
notify_all_committer = models.BooleanField(null=False, blank=False, default=False, verbose_name="Notify on all where committer")