dj2: explicit on_delete on ForeignKey (#37317)

RemovedInDjango20Warning:
on_delete will be a required arg for ForeignKey in Django 2.0. Set it to
models.CASCADE on models and in existing migrations if you want to maintain
the current default behavior.See https://docs.djangoproject.com/en/1.11/ref
/models/fields/#django.db.models.ForeignKey.on_delete
This commit is contained in:
Lauréline Guérin 2019-10-29 15:17:35 +01:00
parent fe29b96a4b
commit 5aa4061c27
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
10 changed files with 20 additions and 20 deletions

View File

@ -17,7 +17,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('start_datetime', models.DateTimeField(verbose_name='Date/time')),
('places', models.PositiveIntegerField(verbose_name='Places')),
('agenda', models.ForeignKey(to='agendas.Agenda')),
('agenda', models.ForeignKey(to='agendas.Agenda', on_delete=models.CASCADE)),
],
options={
'ordering': ['agenda', 'start_datetime'],

View File

@ -17,7 +17,7 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('extra_data', jsonfield.fields.JSONField(null=True)),
('event', models.ForeignKey(to='agendas.Event')),
('event', models.ForeignKey(to='agendas.Event', on_delete=models.CASCADE)),
],
options={
},

View File

@ -42,16 +42,16 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='timeperiod',
name='agenda',
field=models.ForeignKey(to='agendas.Agenda'),
field=models.ForeignKey(to='agendas.Agenda', on_delete=models.CASCADE),
),
migrations.AddField(
model_name='meetingtype',
name='agenda',
field=models.ForeignKey(to='agendas.Agenda'),
field=models.ForeignKey(to='agendas.Agenda', on_delete=models.CASCADE),
),
migrations.AddField(
model_name='event',
name='meeting_type',
field=models.ForeignKey(to='agendas.MeetingType', null=True),
field=models.ForeignKey(to='agendas.MeetingType', null=True, on_delete=models.CASCADE),
),
]

View File

@ -19,11 +19,11 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='agenda',
name='edit_role',
field=models.ForeignKey(related_name='+', default=None, verbose_name='Edit Role', to='auth.Group', blank=True, null=True),
field=models.ForeignKey(related_name='+', default=None, verbose_name='Edit Role', to='auth.Group', blank=True, null=True, on_delete=models.CASCADE),
),
migrations.AddField(
model_name='agenda',
name='view_role',
field=models.ForeignKey(related_name='+', default=None, verbose_name='View Role', to='auth.Group', blank=True, null=True),
field=models.ForeignKey(related_name='+', default=None, verbose_name='View Role', to='auth.Group', blank=True, null=True, on_delete=models.CASCADE),
),
]

View File

@ -14,6 +14,6 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='booking',
name='primary_booking',
field=models.ForeignKey(related_name='secondary_booking_set', to='agendas.Booking', null=True),
field=models.ForeignKey(related_name='secondary_booking_set', to='agendas.Booking', null=True, on_delete=models.CASCADE),
),
]

View File

@ -17,7 +17,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('label', models.CharField(max_length=150, verbose_name='Label')),
('slug', models.SlugField(max_length=150, verbose_name='Identifier')),
('agenda', models.ForeignKey(to='agendas.Agenda')),
('agenda', models.ForeignKey(to='agendas.Agenda', on_delete=models.CASCADE)),
],
options={
'ordering': ['label'],

View File

@ -28,13 +28,13 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='timeperiod',
name='desk',
field=models.ForeignKey(to='agendas.Desk', null=True),
field=models.ForeignKey(to='agendas.Desk', null=True, on_delete=models.CASCADE),
),
migrations.RunPython(set_timeperiod_desk, unset_timeperiod_desk),
migrations.AlterField(
model_name='timeperiod',
name='desk',
field=models.ForeignKey(to='agendas.Desk'),
field=models.ForeignKey(to='agendas.Desk', on_delete=models.CASCADE),
),
migrations.RemoveField(
model_name='timeperiod',

View File

@ -31,7 +31,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='event',
name='desk',
field=models.ForeignKey(to='agendas.Desk', null=True),
field=models.ForeignKey(to='agendas.Desk', null=True, on_delete=models.CASCADE),
),
migrations.RunPython(set_event_desk, unset_event_desk)
]

View File

@ -18,7 +18,7 @@ class Migration(migrations.Migration):
('label', models.CharField(max_length=150, null=True, verbose_name='Optional Label', blank=True)),
('start_datetime', models.DateTimeField(verbose_name='Exception start time')),
('end_datetime', models.DateTimeField(verbose_name='Exception end time')),
('desk', models.ForeignKey(to='agendas.Desk')),
('desk', models.ForeignKey(to='agendas.Desk', on_delete=models.CASCADE)),
],
options={
'ordering': ['start_datetime'],

View File

@ -245,7 +245,7 @@ class TimePeriod(models.Model):
class MeetingType(models.Model):
agenda = models.ForeignKey(Agenda)
agenda = models.ForeignKey(Agenda, on_delete=models.CASCADE)
label = models.CharField(_('Label'), max_length=150)
slug = models.SlugField(_('Identifier'), max_length=160)
duration = models.IntegerField(_('Duration (in minutes)'), default=30)
@ -282,7 +282,7 @@ class MeetingType(models.Model):
@python_2_unicode_compatible
class Event(models.Model):
agenda = models.ForeignKey(Agenda)
agenda = models.ForeignKey(Agenda, on_delete=models.CASCADE)
start_datetime = models.DateTimeField(_('Date/time'))
places = models.PositiveIntegerField(_('Places'))
waiting_list_places = models.PositiveIntegerField(
@ -292,8 +292,8 @@ class Event(models.Model):
description = models.TextField(_('Description'), null=True, blank=True,
help_text=_('Optional event description.'))
full = models.BooleanField(default=False)
meeting_type = models.ForeignKey(MeetingType, null=True)
desk = models.ForeignKey('Desk', null=True)
meeting_type = models.ForeignKey(MeetingType, null=True, on_delete=models.CASCADE)
desk = models.ForeignKey('Desk', null=True, on_delete=models.CASCADE)
class Meta:
ordering = ['agenda', 'start_datetime', 'label']
@ -358,7 +358,7 @@ class Event(models.Model):
class Booking(models.Model):
event = models.ForeignKey(Event)
event = models.ForeignKey(Event, on_delete=models.CASCADE)
extra_data = JSONField(null=True)
cancellation_datetime = models.DateTimeField(null=True)
in_waiting_list = models.BooleanField(default=False)
@ -417,7 +417,7 @@ class Booking(models.Model):
@python_2_unicode_compatible
class Desk(models.Model):
agenda = models.ForeignKey(Agenda)
agenda = models.ForeignKey(Agenda, on_delete=models.CASCADE)
label = models.CharField(_('Label'), max_length=150)
slug = models.SlugField(_('Identifier'), max_length=160)
timeperiod_exceptions_remote_url = models.URLField(
@ -612,7 +612,7 @@ class Desk(models.Model):
@python_2_unicode_compatible
class TimePeriodException(models.Model):
desk = models.ForeignKey(Desk)
desk = models.ForeignKey(Desk, on_delete=models.CASCADE)
external_id = models.CharField(_('External ID'), max_length=256, blank=True)
label = models.CharField(_('Optional Label'), max_length=150, blank=True, null=True)
start_datetime = models.DateTimeField(_('Exception start time'))