Skip to content

Commit 7252295

Browse files
delnegcoddingtonbear
authored andcommitted
Django 2.0 Preps - on_delete=models.CASCADE in models & migrations (coddingtonbear#153)
* Update models.py for django 2.0 on_delete=models.CASCADE on all relationships * on_delete=models.CASCADE in 0001_initial.py Django 2.0 preps
1 parent 08512ac commit 7252295

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

django_mailbox/migrations/0001_initial.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ class Migration(migrations.Migration):
3737
('encoded', models.BooleanField(default=False, help_text='True if the e-mail body is Base64 encoded', verbose_name='Encoded')),
3838
('processed', models.DateTimeField(auto_now_add=True, verbose_name='Processed')),
3939
('read', models.DateTimeField(default=None, null=True, verbose_name='Read', blank=True)),
40-
('in_reply_to', models.ForeignKey(related_name='replies', verbose_name='In reply to', blank=True, to='django_mailbox.Message', null=True)),
41-
('mailbox', models.ForeignKey(related_name='messages', verbose_name='Mailbox', to='django_mailbox.Mailbox')),
40+
('in_reply_to', models.ForeignKey(related_name='replies', verbose_name='In reply to', blank=True, to='django_mailbox.Message', null=True, on_delete=models.CASCADE)),
41+
('mailbox', models.ForeignKey(related_name='messages', verbose_name='Mailbox', to='django_mailbox.Mailbox', on_delete=models.CASCADE)),
4242
],
4343
options={
4444
},
@@ -50,7 +50,7 @@ class Migration(migrations.Migration):
5050
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
5151
('headers', models.TextField(null=True, verbose_name='Headers', blank=True)),
5252
('document', models.FileField(upload_to=b'mailbox_attachments/%Y/%m/%d/', verbose_name='Document')),
53-
('message', models.ForeignKey(related_name='attachments', verbose_name='Message', blank=True, to='django_mailbox.Message', null=True)),
53+
('message', models.ForeignKey(related_name='attachments', verbose_name='Message', blank=True, to='django_mailbox.Message', null=True, on_delete=models.CASCADE)),
5454
],
5555
options={
5656
},

django_mailbox/models.py

+3
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,7 @@ class Message(models.Model):
455455
Mailbox,
456456
related_name='messages',
457457
verbose_name=_(u'Mailbox'),
458+
on_delete=models.CASCADE
458459
)
459460

460461
subject = models.CharField(
@@ -473,6 +474,7 @@ class Message(models.Model):
473474
blank=True,
474475
null=True,
475476
verbose_name=_(u'In reply to'),
477+
on_delete=models.CASCADE
476478
)
477479

478480
from_header = models.CharField(
@@ -748,6 +750,7 @@ class MessageAttachment(models.Model):
748750
null=True,
749751
blank=True,
750752
verbose_name=_('Message'),
753+
on_delete=models.CASCADE
751754
)
752755

753756
headers = models.TextField(

0 commit comments

Comments
 (0)