From 725229560162322af96f5e374bda40db30584669 Mon Sep 17 00:00:00 2001 From: Denis Date: Tue, 5 Dec 2017 18:53:18 +0300 Subject: [PATCH] Django 2.0 Preps - on_delete=models.CASCADE in models & migrations (#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 --- django_mailbox/migrations/0001_initial.py | 6 +++--- django_mailbox/models.py | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/django_mailbox/migrations/0001_initial.py b/django_mailbox/migrations/0001_initial.py index dfb6ffa..0d27460 100644 --- a/django_mailbox/migrations/0001_initial.py +++ b/django_mailbox/migrations/0001_initial.py @@ -37,8 +37,8 @@ class Migration(migrations.Migration): ('encoded', models.BooleanField(default=False, help_text='True if the e-mail body is Base64 encoded', verbose_name='Encoded')), ('processed', models.DateTimeField(auto_now_add=True, verbose_name='Processed')), ('read', models.DateTimeField(default=None, null=True, verbose_name='Read', blank=True)), - ('in_reply_to', models.ForeignKey(related_name='replies', verbose_name='In reply to', blank=True, to='django_mailbox.Message', null=True)), - ('mailbox', models.ForeignKey(related_name='messages', verbose_name='Mailbox', to='django_mailbox.Mailbox')), + ('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)), + ('mailbox', models.ForeignKey(related_name='messages', verbose_name='Mailbox', to='django_mailbox.Mailbox', on_delete=models.CASCADE)), ], options={ }, @@ -50,7 +50,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('headers', models.TextField(null=True, verbose_name='Headers', blank=True)), ('document', models.FileField(upload_to=b'mailbox_attachments/%Y/%m/%d/', verbose_name='Document')), - ('message', models.ForeignKey(related_name='attachments', verbose_name='Message', blank=True, to='django_mailbox.Message', null=True)), + ('message', models.ForeignKey(related_name='attachments', verbose_name='Message', blank=True, to='django_mailbox.Message', null=True, on_delete=models.CASCADE)), ], options={ }, diff --git a/django_mailbox/models.py b/django_mailbox/models.py index 09b62fb..6ca9884 100644 --- a/django_mailbox/models.py +++ b/django_mailbox/models.py @@ -455,6 +455,7 @@ class Message(models.Model): Mailbox, related_name='messages', verbose_name=_(u'Mailbox'), + on_delete=models.CASCADE ) subject = models.CharField( @@ -473,6 +474,7 @@ class Message(models.Model): blank=True, null=True, verbose_name=_(u'In reply to'), + on_delete=models.CASCADE ) from_header = models.CharField( @@ -748,6 +750,7 @@ class MessageAttachment(models.Model): null=True, blank=True, verbose_name=_('Message'), + on_delete=models.CASCADE ) headers = models.TextField(