Commit c2e70f02 authored by Flavio Curella's avatar Flavio Curella Committed by Tim Graham
Browse files

Fixed #21127 -- Started deprecation toward requiring on_delete for ForeignKey/OneToOneField

parent 87d55081

django/contrib/admin/migrations/0001_initial.py

+12 −2
Original line number Diff line number Diff line
@@ -23,8 +23,18 @@ class Migration(migrations.Migration): 
                ('object_repr', models.CharField(max_length=200, verbose_name='object repr')),

                ('action_flag', models.PositiveSmallIntegerField(verbose_name='action flag')),

                ('change_message', models.TextField(verbose_name='change message', blank=True)),

                ('content_type', models.ForeignKey(to_field='id', blank=True, to='contenttypes.ContentType', null=True, verbose_name='content type')),

                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, verbose_name='user')),

                ('content_type', models.ForeignKey(

                    to_field='id',

                    on_delete=models.SET_NULL,

                    blank=True, null=True,

                    to='contenttypes.ContentType',

                    verbose_name='content type',

                )),

                ('user', models.ForeignKey(

                    to=settings.AUTH_USER_MODEL,

                    on_delete=models.CASCADE,

                    verbose_name='user',

                )),

            ],

            options={

                'ordering': ('-action_time',),

django/contrib/admin/models.py

+11 −2
Original line number Diff line number Diff line
@@ -27,8 +27,17 @@ class LogEntryManager(models.Manager): 
@python_2_unicode_compatible

class LogEntry(models.Model):

    action_time = models.DateTimeField(_('action time'), auto_now=True)

    user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_('user'))

    content_type = models.ForeignKey(ContentType, verbose_name=_('content type'), blank=True, null=True)

    user = models.ForeignKey(

        settings.AUTH_USER_MODEL,

        models.CASCADE,

        verbose_name=_('user'),

    )

    content_type = models.ForeignKey(

        ContentType,

        models.SET_NULL,

        verbose_name=_('content type'),

        blank=True, null=True,

    )

    object_id = models.TextField(_('object id'), blank=True, null=True)

    object_repr = models.CharField(_('object repr'), max_length=200)

    action_flag = models.PositiveSmallIntegerField(_('action flag'))

django/contrib/auth/migrations/0001_initial.py

+6 −1
Original line number Diff line number Diff line
@@ -19,7 +19,12 @@ class Migration(migrations.Migration): 
            fields=[

                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),

                ('name', models.CharField(max_length=50, verbose_name='name')),

                ('content_type', models.ForeignKey(to='contenttypes.ContentType', to_field='id', verbose_name='content type')),

                ('content_type', models.ForeignKey(

                    to='contenttypes.ContentType',

                    on_delete=models.CASCADE,

                    to_field='id',

                    verbose_name='content type',

                )),

                ('codename', models.CharField(max_length=100, verbose_name='codename')),

            ],

            options={

django/contrib/auth/models.py

+5 −1
Original line number Diff line number Diff line
@@ -59,7 +59,11 @@ class Permission(models.Model): 
    created for each Django model.

    """

    name = models.CharField(_('name'), max_length=255)

    content_type = models.ForeignKey(ContentType, verbose_name=_('content type'))

    content_type = models.ForeignKey(

        ContentType,

        models.CASCADE,

        verbose_name=_('content type'),

    )

    codename = models.CharField(_('codename'), max_length=100)

    objects = PermissionManager()

django/contrib/contenttypes/fields.py

+1 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ class GenericRelation(ForeignObject): 
        )



        kwargs['blank'] = True

        kwargs['on_delete'] = models.CASCADE

        kwargs['editable'] = False

        kwargs['serialize'] = False