Skip to content

Commit 34244d8

Browse files
committed
Set on_delete=models.CASCADE on all relations
1 parent 7a3257f commit 34244d8

File tree

6 files changed

+34
-34
lines changed

6 files changed

+34
-34
lines changed

pgcommitfest/commitfest/migrations/0001_initial.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Migration(migrations.Migration):
3131
migrations.CreateModel(
3232
name='Committer',
3333
fields=[
34-
('user', models.OneToOneField(primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL)),
34+
('user', models.OneToOneField(primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
3535
('active', models.BooleanField(default=True)),
3636
],
3737
options={
@@ -65,8 +65,8 @@ class Migration(migrations.Migration):
6565
('mailsubject', models.CharField(max_length=500)),
6666
('maildate', models.DateTimeField()),
6767
('mailauthor', models.CharField(max_length=500)),
68-
('mailthread', models.ForeignKey(to='commitfest.MailThread')),
69-
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
68+
('mailthread', models.ForeignKey(to='commitfest.MailThread', on_delete=models.CASCADE)),
69+
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
7070
],
7171
options={
7272
'ordering': ('date',),
@@ -82,7 +82,7 @@ class Migration(migrations.Migration):
8282
('date', models.DateTimeField()),
8383
('author', models.CharField(max_length=500)),
8484
('ispatch', models.NullBooleanField()),
85-
('mailthread', models.ForeignKey(to='commitfest.MailThread')),
85+
('mailthread', models.ForeignKey(to='commitfest.MailThread', on_delete=models.CASCADE)),
8686
],
8787
options={
8888
'ordering': ('-date',),
@@ -111,8 +111,8 @@ class Migration(migrations.Migration):
111111
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
112112
('date', models.DateTimeField(auto_now_add=True)),
113113
('what', models.CharField(max_length=500)),
114-
('by', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
115-
('patch', models.ForeignKey(to='commitfest.Patch')),
114+
('by', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
115+
('patch', models.ForeignKey(to='commitfest.Patch', on_delete=models.CASCADE)),
116116
],
117117
options={
118118
'ordering': ('-date',),
@@ -125,8 +125,8 @@ class Migration(migrations.Migration):
125125
('enterdate', models.DateTimeField()),
126126
('leavedate', models.DateTimeField(null=True, blank=True)),
127127
('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')])),
128-
('commitfest', models.ForeignKey(to='commitfest.CommitFest')),
129-
('patch', models.ForeignKey(to='commitfest.Patch')),
128+
('commitfest', models.ForeignKey(to='commitfest.CommitFest', on_delete=models.CASCADE)),
129+
('patch', models.ForeignKey(to='commitfest.Patch', on_delete=models.CASCADE)),
130130
],
131131
options={
132132
'ordering': ('-commitfest__startdate',),
@@ -155,7 +155,7 @@ class Migration(migrations.Migration):
155155
migrations.AddField(
156156
model_name='patch',
157157
name='committer',
158-
field=models.ForeignKey(blank=True, to='commitfest.Committer', null=True),
158+
field=models.ForeignKey(blank=True, to='commitfest.Committer', null=True, on_delete=models.CASCADE),
159159
),
160160
migrations.AddField(
161161
model_name='patch',
@@ -165,7 +165,7 @@ class Migration(migrations.Migration):
165165
migrations.AddField(
166166
model_name='patch',
167167
name='topic',
168-
field=models.ForeignKey(to='commitfest.Topic'),
168+
field=models.ForeignKey(to='commitfest.Topic', on_delete=models.CASCADE),
169169
),
170170
migrations.AddField(
171171
model_name='mailthread',

pgcommitfest/commitfest/migrations/0002_notifications.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class Migration(migrations.Migration):
1717
name='PendingNotification',
1818
fields=[
1919
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
20-
('history', models.ForeignKey(to='commitfest.PatchHistory')),
21-
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
20+
('history', models.ForeignKey(to='commitfest.PatchHistory', on_delete=models.CASCADE)),
21+
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
2222
],
2323
),
2424
migrations.AddField(

pgcommitfest/commitfest/models.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# need to extend from the user model, so just create a separate
1313
# class.
1414
class Committer(models.Model):
15-
user = models.OneToOneField(User, null=False, blank=False, primary_key=True)
15+
user = models.OneToOneField(User, null=False, blank=False, primary_key=True, on_delete=models.CASCADE)
1616
active = models.BooleanField(null=False, blank=False, default=True)
1717

1818
def __str__(self):
@@ -87,7 +87,7 @@ def __str__(self):
8787

8888
class Patch(models.Model, DiffableModel):
8989
name = models.CharField(max_length=500, blank=False, null=False, verbose_name='Description')
90-
topic = models.ForeignKey(Topic, blank=False, null=False)
90+
topic = models.ForeignKey(Topic, blank=False, null=False, on_delete=models.CASCADE)
9191

9292
# One patch can be in multiple commitfests, if it has history
9393
commitfests = models.ManyToManyField(CommitFest, through='PatchOnCommitFest')
@@ -99,12 +99,12 @@ class Patch(models.Model, DiffableModel):
9999
gitlink = models.URLField(blank=True, null=False, default='')
100100

101101
# Version targeted by this patch
102-
targetversion = models.ForeignKey(TargetVersion, blank=True, null=True, verbose_name="Target version")
102+
targetversion = models.ForeignKey(TargetVersion, blank=True, null=True, verbose_name="Target version", on_delete=models.CASCADE)
103103

104104
authors = models.ManyToManyField(User, related_name='patch_author', blank=True)
105105
reviewers = models.ManyToManyField(User, related_name='patch_reviewer', blank=True)
106106

107-
committer = models.ForeignKey(Committer, blank=True, null=True)
107+
committer = models.ForeignKey(Committer, blank=True, null=True, on_delete=models.CASCADE)
108108

109109
# Users to be notified when something happens
110110
subscribers = models.ManyToManyField(User, related_name='patch_subscriber', blank=True)
@@ -201,8 +201,8 @@ class PatchOnCommitFest(models.Model):
201201
def OPEN_STATUS_CHOICES(cls):
202202
return [x for x in cls._STATUS_CHOICES if x[0] in cls.OPEN_STATUSES]
203203

204-
patch = models.ForeignKey(Patch, blank=False, null=False)
205-
commitfest = models.ForeignKey(CommitFest, blank=False, null=False)
204+
patch = models.ForeignKey(Patch, blank=False, null=False, on_delete=models.CASCADE)
205+
commitfest = models.ForeignKey(CommitFest, blank=False, null=False, on_delete=models.CASCADE)
206206
enterdate = models.DateTimeField(blank=False, null=False)
207207
leavedate = models.DateTimeField(blank=True, null=True)
208208

@@ -222,9 +222,9 @@ class Meta:
222222

223223

224224
class PatchHistory(models.Model):
225-
patch = models.ForeignKey(Patch, blank=False, null=False)
225+
patch = models.ForeignKey(Patch, blank=False, null=False, on_delete=models.CASCADE)
226226
date = models.DateTimeField(blank=False, null=False, auto_now_add=True, db_index=True)
227-
by = models.ForeignKey(User, blank=False, null=False)
227+
by = models.ForeignKey(User, blank=False, null=False, on_delete=models.CASCADE)
228228
what = models.CharField(max_length=500, null=False, blank=False)
229229

230230
@property
@@ -301,7 +301,7 @@ class Meta:
301301

302302

303303
class MailThreadAttachment(models.Model):
304-
mailthread = models.ForeignKey(MailThread, null=False, blank=False)
304+
mailthread = models.ForeignKey(MailThread, null=False, blank=False, on_delete=models.CASCADE)
305305
messageid = models.CharField(max_length=1000, null=False, blank=False)
306306
attachmentid = models.IntegerField(null=False, blank=False)
307307
filename = models.CharField(max_length=1000, null=False, blank=True)
@@ -315,9 +315,9 @@ class Meta:
315315

316316

317317
class MailThreadAnnotation(models.Model):
318-
mailthread = models.ForeignKey(MailThread, null=False, blank=False)
318+
mailthread = models.ForeignKey(MailThread, null=False, blank=False, on_delete=models.CASCADE)
319319
date = models.DateTimeField(null=False, blank=False, auto_now_add=True)
320-
user = models.ForeignKey(User, null=False, blank=False)
320+
user = models.ForeignKey(User, null=False, blank=False, on_delete=models.CASCADE)
321321
msgid = models.CharField(max_length=1000, null=False, blank=False)
322322
annotationtext = models.TextField(null=False, blank=False, max_length=2000)
323323
mailsubject = models.CharField(max_length=500, null=False, blank=False)
@@ -339,5 +339,5 @@ class PatchStatus(models.Model):
339339

340340

341341
class PendingNotification(models.Model):
342-
history = models.ForeignKey(PatchHistory, blank=False, null=False)
343-
user = models.ForeignKey(User, blank=False, null=False)
342+
history = models.ForeignKey(PatchHistory, blank=False, null=False, on_delete=models.CASCADE)
343+
user = models.ForeignKey(User, blank=False, null=False, on_delete=models.CASCADE)

pgcommitfest/userprofile/migrations/0001_initial.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
2020
('confirmed', models.BooleanField(default=False)),
2121
('token', models.CharField(max_length=100, blank=True)),
2222
('tokensent', models.DateTimeField()),
23-
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
23+
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
2424
],
2525
options={
2626
'ordering': ('user', 'email'),
@@ -30,8 +30,8 @@ class Migration(migrations.Migration):
3030
name='UserProfile',
3131
fields=[
3232
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
33-
('selectedemail', models.ForeignKey(verbose_name='Sender email', blank=True, to='userprofile.UserExtraEmail', null=True)),
34-
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
33+
('selectedemail', models.ForeignKey(verbose_name='Sender email', blank=True, to='userprofile.UserExtraEmail', null=True, on_delete=models.CASCADE)),
34+
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
3535
],
3636
),
3737
migrations.AlterUniqueTogether(

pgcommitfest/userprofile/migrations/0002_notifications.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ class Migration(migrations.Migration):
3030
migrations.AddField(
3131
model_name='userprofile',
3232
name='notifyemail',
33-
field=models.ForeignKey(related_name='notifier', verbose_name='Notifications sent to', blank=True, to='userprofile.UserExtraEmail', null=True),
33+
field=models.ForeignKey(related_name='notifier', verbose_name='Notifications sent to', blank=True, to='userprofile.UserExtraEmail', null=True, on_delete=models.CASCADE),
3434
),
3535
migrations.AlterField(
3636
model_name='userprofile',
3737
name='user',
38-
field=models.OneToOneField(to=settings.AUTH_USER_MODEL),
38+
field=models.OneToOneField(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
3939
),
4040
]

pgcommitfest/userprofile/models.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44

55
class UserExtraEmail(models.Model):
6-
user = models.ForeignKey(User, null=False, blank=False, db_index=True)
6+
user = models.ForeignKey(User, null=False, blank=False, db_index=True, on_delete=models.CASCADE)
77
email = models.EmailField(max_length=100, null=False, blank=False, unique=True)
88
confirmed = models.BooleanField(null=False, blank=False, default=False)
99
token = models.CharField(max_length=100, null=False, blank=True)
@@ -18,12 +18,12 @@ class Meta:
1818

1919

2020
class UserProfile(models.Model):
21-
user = models.OneToOneField(User, null=False, blank=False)
21+
user = models.OneToOneField(User, null=False, blank=False, on_delete=models.CASCADE)
2222
selectedemail = models.ForeignKey(UserExtraEmail, null=True, blank=True,
23-
verbose_name='Sender email')
23+
verbose_name='Sender email', on_delete=models.CASCADE)
2424
notifyemail = models.ForeignKey(UserExtraEmail, null=True, blank=True,
2525
verbose_name='Notifications sent to',
26-
related_name='notifier')
26+
related_name='notifier', on_delete=models.CASCADE)
2727
notify_all_author = models.BooleanField(null=False, blank=False, default=False, verbose_name="Notify on all where author")
2828
notify_all_reviewer = models.BooleanField(null=False, blank=False, default=False, verbose_name="Notify on all where reviewer")
2929
notify_all_committer = models.BooleanField(null=False, blank=False, default=False, verbose_name="Notify on all where committer")

0 commit comments

Comments
 (0)