Commit 26346faeda92248a406b1f71fe12f9422f3c6ab6
1 parent
d1af2be5
Added on_delete arguments to ForeignKeys
Showing
3 changed files
with
19 additions
and
11 deletions
| @@ -34,10 +34,11 @@ class Migration(migrations.Migration): | @@ -34,10 +34,11 @@ class Migration(migrations.Migration): | ||
| 34 | ' message will be displayed instead.', | 34 | ' message will be displayed instead.', |
| 35 | verbose_name='is removed')), | 35 | verbose_name='is removed')), |
| 36 | ('content_type', models.ForeignKey(related_name='content_type_set_for_comment', | 36 | ('content_type', models.ForeignKey(related_name='content_type_set_for_comment', |
| 37 | - verbose_name='content type', to='contenttypes.ContentType')), | ||
| 38 | - ('site', models.ForeignKey(to='sites.Site')), | 37 | + verbose_name='content type', to='contenttypes.ContentType', |
| 38 | + on_delete=models.CASCADE)), | ||
| 39 | + ('site', models.ForeignKey(to='sites.Site', on_delete=models.CASCADE)), | ||
| 39 | ('user', models.ForeignKey(related_name='comment_comments', verbose_name='user', | 40 | ('user', models.ForeignKey(related_name='comment_comments', verbose_name='user', |
| 40 | - blank=True, to=settings.AUTH_USER_MODEL, null=True)), | 41 | + blank=True, to=settings.AUTH_USER_MODEL, null=True, on_delete=models.SET_NULL)), |
| 41 | ], | 42 | ], |
| 42 | options={ | 43 | options={ |
| 43 | 'ordering': ('submit_date',), | 44 | 'ordering': ('submit_date',), |
| @@ -55,9 +56,9 @@ class Migration(migrations.Migration): | @@ -55,9 +56,9 @@ class Migration(migrations.Migration): | ||
| 55 | ('flag', models.CharField(max_length=30, verbose_name='flag', db_index=True)), | 56 | ('flag', models.CharField(max_length=30, verbose_name='flag', db_index=True)), |
| 56 | ('flag_date', models.DateTimeField(default=None, verbose_name='date')), | 57 | ('flag_date', models.DateTimeField(default=None, verbose_name='date')), |
| 57 | ('comment', models.ForeignKey(related_name='flags', verbose_name='comment', | 58 | ('comment', models.ForeignKey(related_name='flags', verbose_name='comment', |
| 58 | - to='django_comments.Comment')), | 59 | + to='django_comments.Comment', on_delete=models.CASCADE)), |
| 59 | ('user', models.ForeignKey(related_name='comment_flags', verbose_name='user', | 60 | ('user', models.ForeignKey(related_name='comment_flags', verbose_name='user', |
| 60 | - to=settings.AUTH_USER_MODEL)), | 61 | + to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)), |
| 61 | ], | 62 | ], |
| 62 | options={ | 63 | options={ |
| 63 | 'db_table': 'django_comment_flags', | 64 | 'db_table': 'django_comment_flags', |
| @@ -22,12 +22,13 @@ class BaseCommentAbstractModel(models.Model): | @@ -22,12 +22,13 @@ class BaseCommentAbstractModel(models.Model): | ||
| 22 | # Content-object field | 22 | # Content-object field |
| 23 | content_type = models.ForeignKey(ContentType, | 23 | content_type = models.ForeignKey(ContentType, |
| 24 | verbose_name=_('content type'), | 24 | verbose_name=_('content type'), |
| 25 | - related_name="content_type_set_for_%(class)s") | 25 | + related_name="content_type_set_for_%(class)s", |
| 26 | + on_delete=models.CASCADE) | ||
| 26 | object_pk = models.TextField(_('object ID')) | 27 | object_pk = models.TextField(_('object ID')) |
| 27 | content_object = GenericForeignKey(ct_field="content_type", fk_field="object_pk") | 28 | content_object = GenericForeignKey(ct_field="content_type", fk_field="object_pk") |
| 28 | 29 | ||
| 29 | # Metadata about the comment | 30 | # Metadata about the comment |
| 30 | - site = models.ForeignKey(Site) | 31 | + site = models.ForeignKey(Site, on_delete=models.CASCADE) |
| 31 | 32 | ||
| 32 | class Meta: | 33 | class Meta: |
| 33 | abstract = True | 34 | abstract = True |
| @@ -52,7 +53,8 @@ class CommentAbstractModel(BaseCommentAbstractModel): | @@ -52,7 +53,8 @@ class CommentAbstractModel(BaseCommentAbstractModel): | ||
| 52 | # user; otherwise at least user_name should have been set and the comment | 53 | # user; otherwise at least user_name should have been set and the comment |
| 53 | # was posted by a non-authenticated user. | 54 | # was posted by a non-authenticated user. |
| 54 | user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_('user'), | 55 | user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_('user'), |
| 55 | - blank=True, null=True, related_name="%(class)s_comments") | 56 | + blank=True, null=True, related_name="%(class)s_comments", |
| 57 | + on_delete=models.SET_NULL) | ||
| 56 | user_name = models.CharField(_("user's name"), max_length=50, blank=True) | 58 | user_name = models.CharField(_("user's name"), max_length=50, blank=True) |
| 57 | # Explicit `max_length` to apply both to Django 1.7 and 1.8+. | 59 | # Explicit `max_length` to apply both to Django 1.7 and 1.8+. |
| 58 | user_email = models.EmailField(_("user's email address"), max_length=254, | 60 | user_email = models.EmailField(_("user's email address"), max_length=254, |
| @@ -186,8 +188,13 @@ class CommentFlag(models.Model): | @@ -186,8 +188,13 @@ class CommentFlag(models.Model): | ||
| 186 | design users are only allowed to flag a comment with a given flag once; | 188 | design users are only allowed to flag a comment with a given flag once; |
| 187 | if you want rating look elsewhere. | 189 | if you want rating look elsewhere. |
| 188 | """ | 190 | """ |
| 189 | - user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_('user'), related_name="comment_flags") | ||
| 190 | - comment = models.ForeignKey(Comment, verbose_name=_('comment'), related_name="flags") | 191 | + user = models.ForeignKey( |
| 192 | + settings.AUTH_USER_MODEL, verbose_name=_('user'), related_name="comment_flags", | ||
| 193 | + on_delete=models.CASCADE, | ||
| 194 | + ) | ||
| 195 | + comment = models.ForeignKey( | ||
| 196 | + Comment, verbose_name=_('comment'), related_name="flags", on_delete=models.CASCADE, | ||
| 197 | + ) | ||
| 191 | flag = models.CharField(_('flag'), max_length=30, db_index=True) | 198 | flag = models.CharField(_('flag'), max_length=30, db_index=True) |
| 192 | flag_date = models.DateTimeField(_('date'), default=None) | 199 | flag_date = models.DateTimeField(_('date'), default=None) |
| 193 | 200 |
| @@ -20,7 +20,7 @@ class Author(models.Model): | @@ -20,7 +20,7 @@ class Author(models.Model): | ||
| 20 | 20 | ||
| 21 | @python_2_unicode_compatible | 21 | @python_2_unicode_compatible |
| 22 | class Article(models.Model): | 22 | class Article(models.Model): |
| 23 | - author = models.ForeignKey(Author) | 23 | + author = models.ForeignKey(Author, on_delete=models.CASCADE) |
| 24 | headline = models.CharField(max_length=100) | 24 | headline = models.CharField(max_length=100) |
| 25 | 25 | ||
| 26 | def __str__(self): | 26 | def __str__(self): |
Please
register
or
login
to post a comment