From 11fca74fece1d1305bfd0265aefe9fbfdc1773db Mon Sep 17 00:00:00 2001 From: Basraah Date: Thu, 28 Sep 2017 12:32:33 +1000 Subject: [PATCH] Add required on_delete parameters for Dj2.0 compatibility --- allianceauth/corputils/models.py | 2 +- .../eveonline/migrations/0009_on_delete.py | 21 +++++++++++ allianceauth/eveonline/models.py | 2 +- allianceauth/fleetactivitytracking/models.py | 4 +-- .../migrations/0007_on_delete.py | 36 +++++++++++++++++++ allianceauth/groupmanagement/models.py | 13 +++++-- allianceauth/hrapplications/models.py | 2 +- .../optimer/migrations/0004_on_delete.py | 21 +++++++++++ allianceauth/optimer/models.py | 2 +- .../services/modules/mumble/models.py | 2 +- .../services/modules/teamspeak3/models.py | 4 +-- allianceauth/srp/migrations/0004_on_delete.py | 26 ++++++++++++++ allianceauth/srp/models.py | 6 ++-- .../timerboard/migrations/0003_on_delete.py | 27 ++++++++++++++ allianceauth/timerboard/models.py | 6 ++-- 15 files changed, 156 insertions(+), 18 deletions(-) create mode 100644 allianceauth/eveonline/migrations/0009_on_delete.py create mode 100644 allianceauth/groupmanagement/migrations/0007_on_delete.py create mode 100644 allianceauth/optimer/migrations/0004_on_delete.py create mode 100644 allianceauth/srp/migrations/0004_on_delete.py create mode 100644 allianceauth/timerboard/migrations/0003_on_delete.py diff --git a/allianceauth/corputils/models.py b/allianceauth/corputils/models.py index 58643a67..c07d68c0 100644 --- a/allianceauth/corputils/models.py +++ b/allianceauth/corputils/models.py @@ -18,7 +18,7 @@ logger = logging.getLogger(__name__) class CorpStats(models.Model): token = models.ForeignKey(Token, on_delete=models.CASCADE) - corp = models.OneToOneField(EveCorporationInfo) + corp = models.OneToOneField(EveCorporationInfo, on_delete=models.CASCADE) last_update = models.DateTimeField(auto_now=True) class Meta: diff --git a/allianceauth/eveonline/migrations/0009_on_delete.py b/allianceauth/eveonline/migrations/0009_on_delete.py new file mode 100644 index 00000000..ad534248 --- /dev/null +++ b/allianceauth/eveonline/migrations/0009_on_delete.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2017-09-28 02:16 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('eveonline', '0008_remove_apikeys'), + ] + + operations = [ + migrations.AlterField( + model_name='evecorporationinfo', + name='alliance', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='eveonline.EveAllianceInfo'), + ), + ] diff --git a/allianceauth/eveonline/models.py b/allianceauth/eveonline/models.py index 872c33f1..b7754c52 100644 --- a/allianceauth/eveonline/models.py +++ b/allianceauth/eveonline/models.py @@ -41,7 +41,7 @@ class EveCorporationInfo(models.Model): corporation_name = models.CharField(max_length=254, unique=True) corporation_ticker = models.CharField(max_length=254) member_count = models.IntegerField() - alliance = models.ForeignKey(EveAllianceInfo, blank=True, null=True) + alliance = models.ForeignKey(EveAllianceInfo, blank=True, null=True, on_delete=models.SET_NULL) objects = EveCorporationManager() provider = EveCorporationProviderManager() diff --git a/allianceauth/fleetactivitytracking/models.py b/allianceauth/fleetactivitytracking/models.py index 3cf4607d..8bb248b4 100644 --- a/allianceauth/fleetactivitytracking/models.py +++ b/allianceauth/fleetactivitytracking/models.py @@ -23,11 +23,11 @@ class Fatlink(models.Model): class Fat(models.Model): character = models.ForeignKey(EveCharacter, on_delete=models.CASCADE) - fatlink = models.ForeignKey(Fatlink) + fatlink = models.ForeignKey(Fatlink, on_delete=models.CASCADE) system = models.CharField(max_length=30) shiptype = models.CharField(max_length=30) station = models.CharField(max_length=125) - user = models.ForeignKey(User) + user = models.ForeignKey(User, on_delete=models.CASCADE) class Meta: unique_together = (('character', 'fatlink'),) diff --git a/allianceauth/groupmanagement/migrations/0007_on_delete.py b/allianceauth/groupmanagement/migrations/0007_on_delete.py new file mode 100644 index 00000000..022e93bd --- /dev/null +++ b/allianceauth/groupmanagement/migrations/0007_on_delete.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2017-09-28 02:16 +from __future__ import unicode_literals + +import django.contrib.auth.models +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('auth', '0008_alter_user_username_max_length'), + ('groupmanagement', '0006_request_groups_perm'), + ] + + operations = [ + migrations.CreateModel( + name='ProxyGroup', + fields=[ + ], + options={ + 'verbose_name': 'group', + 'indexes': [], + 'proxy': True, + 'verbose_name_plural': 'groups', + }, + bases=('auth.group',), + managers=[ + ('objects', django.contrib.auth.models.GroupManager()), + ], + ), + migrations.RemoveField( + model_name='grouprequest', + name='main_char', + ), + ] diff --git a/allianceauth/groupmanagement/models.py b/allianceauth/groupmanagement/models.py index bcb1b24d..ed9310ef 100644 --- a/allianceauth/groupmanagement/models.py +++ b/allianceauth/groupmanagement/models.py @@ -10,9 +10,16 @@ from allianceauth.eveonline.models import EveCharacter class GroupRequest(models.Model): status = models.CharField(max_length=254) leave_request = models.BooleanField(default=0) - user = models.ForeignKey(User) - group = models.ForeignKey(Group) - main_char = models.ForeignKey(EveCharacter) + user = models.ForeignKey(User, on_delete=models.CASCADE) + group = models.ForeignKey(Group, on_delete=models.CASCADE) + + @property + def main_char(self): + """ + Legacy property for main character + :return: self.users main character + """ + return self.user.profile.main_character def __str__(self): return self.user.username + ":" + self.group.name diff --git a/allianceauth/hrapplications/models.py b/allianceauth/hrapplications/models.py index 82317549..a9bf57e8 100755 --- a/allianceauth/hrapplications/models.py +++ b/allianceauth/hrapplications/models.py @@ -23,7 +23,7 @@ class ApplicationChoice(models.Model): class ApplicationForm(models.Model): questions = SortedManyToManyField(ApplicationQuestion) - corp = models.OneToOneField(EveCorporationInfo) + corp = models.OneToOneField(EveCorporationInfo, on_delete=models.CASCADE) def __str__(self): return str(self.corp) diff --git a/allianceauth/optimer/migrations/0004_on_delete.py b/allianceauth/optimer/migrations/0004_on_delete.py new file mode 100644 index 00000000..958cdff8 --- /dev/null +++ b/allianceauth/optimer/migrations/0004_on_delete.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2017-09-28 02:16 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('optimer', '0003_make_strings_more_stringy'), + ] + + operations = [ + migrations.AlterField( + model_name='optimer', + name='eve_character', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='eveonline.EveCharacter'), + ), + ] diff --git a/allianceauth/optimer/models.py b/allianceauth/optimer/models.py index fe9d19b9..08a17e3e 100644 --- a/allianceauth/optimer/models.py +++ b/allianceauth/optimer/models.py @@ -17,7 +17,7 @@ class OpTimer(models.Model): operation_name = models.CharField(max_length=254, default="") fc = models.CharField(max_length=254, default="") post_time = models.DateTimeField(default=timezone.now) - eve_character = models.ForeignKey(EveCharacter) + eve_character = models.ForeignKey(EveCharacter, null=True, on_delete=models.SET_NULL) def __str__(self): return self.operation_name diff --git a/allianceauth/services/modules/mumble/models.py b/allianceauth/services/modules/mumble/models.py index 8df6be40..6e0a8e0d 100644 --- a/allianceauth/services/modules/mumble/models.py +++ b/allianceauth/services/modules/mumble/models.py @@ -2,7 +2,7 @@ from django.db import models class MumbleUser(models.Model): - user = models.OneToOneField('auth.User', related_name='mumble', null=True) + user = models.OneToOneField('auth.User', related_name='mumble', null=True, on_delete=models.CASCADE) username = models.CharField(max_length=254, unique=True) pwhash = models.CharField(max_length=80) hashfn = models.CharField(max_length=20, default='sha1') diff --git a/allianceauth/services/modules/teamspeak3/models.py b/allianceauth/services/modules/teamspeak3/models.py index 0aa885f8..2c8e7dc3 100644 --- a/allianceauth/services/modules/teamspeak3/models.py +++ b/allianceauth/services/modules/teamspeak3/models.py @@ -30,7 +30,7 @@ class TSgroup(models.Model): class AuthTS(models.Model): - auth_group = models.ForeignKey('auth.Group') + auth_group = models.ForeignKey('auth.Group', on_delete=models.CASCADE) ts_group = models.ManyToManyField(TSgroup) class Meta: @@ -41,7 +41,7 @@ class AuthTS(models.Model): class UserTSgroup(models.Model): - user = models.ForeignKey('auth.User') + user = models.ForeignKey('auth.User', on_delete=models.CASCADE) ts_group = models.ManyToManyField(TSgroup) class Meta: diff --git a/allianceauth/srp/migrations/0004_on_delete.py b/allianceauth/srp/migrations/0004_on_delete.py new file mode 100644 index 00000000..d4fd505a --- /dev/null +++ b/allianceauth/srp/migrations/0004_on_delete.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2017-09-28 02:16 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('srp', '0003_make_strings_more_stringy'), + ] + + operations = [ + migrations.AlterField( + model_name='srpfleetmain', + name='fleet_commander', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='eveonline.EveCharacter'), + ), + migrations.AlterField( + model_name='srpuserrequest', + name='character', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='eveonline.EveCharacter'), + ), + ] diff --git a/allianceauth/srp/models.py b/allianceauth/srp/models.py index 6effbef4..b3ebc7d9 100755 --- a/allianceauth/srp/models.py +++ b/allianceauth/srp/models.py @@ -10,7 +10,7 @@ class SrpFleetMain(models.Model): fleet_time = models.DateTimeField() fleet_srp_code = models.CharField(max_length=254, default="") fleet_srp_status = models.CharField(max_length=254, default="") - fleet_commander = models.ForeignKey(EveCharacter) + fleet_commander = models.ForeignKey(EveCharacter, null=True, on_delete=models.SET_NULL) fleet_srp_aar_link = models.CharField(max_length=254, default="") def __str__(self): @@ -40,8 +40,8 @@ class SrpUserRequest(models.Model): additional_info = models.CharField(max_length=254, default="") srp_status = models.CharField(max_length=8, default="Pending", choices=SRP_STATUS_CHOICES) srp_total_amount = models.BigIntegerField(default=0) - character = models.ForeignKey(EveCharacter) - srp_fleet_main = models.ForeignKey(SrpFleetMain) + character = models.ForeignKey(EveCharacter, null=True, on_delete=models.SET_NULL) + srp_fleet_main = models.ForeignKey(SrpFleetMain, on_delete=models.CASCADE) kb_total_loss = models.BigIntegerField(default=0) srp_ship_name = models.CharField(max_length=254, default="") post_time = models.DateTimeField(default=timezone.now) diff --git a/allianceauth/timerboard/migrations/0003_on_delete.py b/allianceauth/timerboard/migrations/0003_on_delete.py new file mode 100644 index 00000000..899f6dc0 --- /dev/null +++ b/allianceauth/timerboard/migrations/0003_on_delete.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2017-09-28 02:16 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('timerboard', '0002_make_strings_more_stringy'), + ] + + operations = [ + migrations.AlterField( + model_name='timer', + name='eve_character', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='eveonline.EveCharacter'), + ), + migrations.AlterField( + model_name='timer', + name='user', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/allianceauth/timerboard/models.py b/allianceauth/timerboard/models.py index 708e7dc6..d5391583 100755 --- a/allianceauth/timerboard/models.py +++ b/allianceauth/timerboard/models.py @@ -16,10 +16,10 @@ class Timer(models.Model): objective = models.CharField(max_length=254, default="") eve_time = models.DateTimeField() important = models.BooleanField(default=False) - eve_character = models.ForeignKey(EveCharacter) - eve_corp = models.ForeignKey(EveCorporationInfo) + eve_character = models.ForeignKey(EveCharacter, null=True, on_delete=models.SET_NULL) + eve_corp = models.ForeignKey(EveCorporationInfo, on_delete=models.CASCADE) corp_timer = models.BooleanField(default=False) - user = models.ForeignKey(User) + user = models.ForeignKey(User, null=True, on_delete=models.SET_NULL) def __str__(self): return str(self.system) + ' ' + str(self.details)