0001-misc-add-explicit-on_delete-on-all-FKs-36608.patch

Lauréline Guérin, 02 octobre 2019 14:49

Voir les différences: en ligne côte à côte

Subject: [PATCH 1/4] misc: add explicit on_delete on all FKs (#36608)

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

 passerelle/apps/astregs/models.py                  |  2 +-
 .../apps/csvdatasource/migrations/0007_query.py    |  2 +-
 passerelle/apps/csvdatasource/models.py            |  4 ++--
 passerelle/apps/family/migrations/0001_initial.py  | 14 +++++++-------
 .../family/migrations/0003_auto_20161021_0333.py   |  2 +-
 passerelle/apps/family/models.py                   | 12 ++++++------
 passerelle/apps/gesbac/models.py                   |  2 +-
 .../migrations/0002_jsondata_datastore.py          |  2 +-
 passerelle/apps/jsondatastore/models.py            |  2 +-
 passerelle/apps/mdel/migrations/0001_initial.py    |  2 +-
 passerelle/apps/mdel/models.py                     |  2 +-
 passerelle/apps/phonecalls/models.py               |  2 +-
 passerelle/apps/solis/migrations/0001_initial.py   |  2 +-
 passerelle/apps/solis/models.py                    |  4 ++--
 passerelle/apps/sp_fr/models.py                    |  6 ++++--
 passerelle/base/migrations/0001_initial.py         |  4 ++--
 passerelle/base/migrations/0006_resourcestatus.py  |  2 +-
 passerelle/base/models.py                          | 12 ++++++------
 .../contrib/agoraplus/migrations/0001_initial.py   |  2 +-
 .../agoraplus/migrations/0002_agoraplussas.py      |  2 +-
 passerelle/contrib/agoraplus/models.py             |  4 ++--
 .../contrib/dpark/migrations/0001_initial.py       |  2 +-
 passerelle/contrib/dpark/models.py                 |  2 +-
 passerelle/contrib/planitech/models.py             |  2 +-
 .../teamnet_axel/migrations/0001_initial.py        |  2 +-
 .../teamnet_axel/migrations/0006_rename_model_2.py |  2 +-
 passerelle/contrib/teamnet_axel/models.py          |  2 +-
 27 files changed, 50 insertions(+), 48 deletions(-)

     class Link(models.Model):
         resource = models.ForeignKey(AstreGS)
         resource = models.ForeignKey(AstreGS, on_delete=models.CASCADE)
         name_id = models.CharField(max_length=32)
         association_id = models.CharField(max_length=32)
         created = models.DateTimeField(auto_now_add=True)

                     ('order', models.TextField(help_text='Columns to use for sorting rows', verbose_name='Sort Order', blank=True)),
                     ('distinct', models.TextField(help_text='Distinct columns', verbose_name='Distinct', blank=True)),
                     ('structure', models.CharField(default=b'dict', help_text='Data structure used for the response', max_length=20, verbose_name='Structure', choices=[(b'array', 'Array'), (b'dict', 'Dictionary'), (b'tuples', 'Tuples'), (b'onerow', 'Single Row'), (b'one', 'Single Value')])),
                     ('resource', models.ForeignKey(to='csvdatasource.CsvDataSource')),
                     ('resource', models.ForeignKey(to='csvdatasource.CsvDataSource', on_delete=models.CASCADE)),
                 ],
                 options={
                     'ordering': ['slug'],

     class Query(models.Model):
         resource = models.ForeignKey('CsvDataSource')
         resource = models.ForeignKey('CsvDataSource', on_delete=models.CASCADE)
         slug = models.SlugField(_('Name (slug)'))
         label = models.CharField(_('Label'), max_length=100)
         description = models.TextField(_('Description'), blank=True)
-...
     class TableRow(models.Model):
         resource = models.ForeignKey('CsvDataSource')
         resource = models.ForeignKey('CsvDataSource', on_delete=models.CASCADE)
         line_number = models.IntegerField(null=False)
         data = jsonfield.JSONField(blank=True)

                 fields=[
                     ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                     ('name_id', models.CharField(max_length=256)),
                     ('family', models.ForeignKey(to='family.Family')),
                     ('family', models.ForeignKey(to='family.Family', on_delete=models.CASCADE)),
                 ],
             ),
             migrations.CreateModel(
-...
                     ('payment_date', models.DateTimeField(null=True, verbose_name='Payment date')),
                     ('autobilling', models.BooleanField(default=False, verbose_name='Autobilling')),
                     ('payment_transaction_id', models.CharField(max_length=128, null=True, verbose_name='Payment transaction id')),
                     ('family', models.ForeignKey(to='family.Family')),
                     ('resource', models.ForeignKey(to='family.GenericFamily')),
                     ('family', models.ForeignKey(to='family.Family', on_delete=models.CASCADE)),
                     ('resource', models.ForeignKey(to='family.GenericFamily', on_delete=models.CASCADE)),
                 ],
                 options={
                     'ordering': ['issue_date'],
-...
             migrations.AddField(
                 model_name='familylink',
                 name='resource',
                 field=models.ForeignKey(to='family.GenericFamily'),
                 field=models.ForeignKey(to='family.GenericFamily', on_delete=models.CASCADE),
             ),
             migrations.AddField(
                 model_name='family',
                 name='resource',
                 field=models.ForeignKey(to='family.GenericFamily'),
                 field=models.ForeignKey(to='family.GenericFamily', on_delete=models.CASCADE),
             ),
             migrations.AddField(
                 model_name='child',
                 name='family',
                 field=models.ForeignKey(to='family.Family'),
                 field=models.ForeignKey(to='family.Family', on_delete=models.CASCADE),
             ),
             migrations.AddField(
                 model_name='adult',
                 name='family',
                 field=models.ForeignKey(to='family.Family'),
                 field=models.ForeignKey(to='family.Family', on_delete=models.CASCADE),
             ),
+        ]

passerelle/apps/family/migrations/0003_auto_20161021_0333.py
19	19	migrations.AlterField(
20	20	model_name='invoice',
21	21	name='family',
22		field=models.ForeignKey(to='family.Family', null=True),
	22	field=models.ForeignKey(to='family.Family', null=True, on_delete=models.CASCADE),
23	23	),
24	24	]

     class FamilyLink(models.Model):
         resource = models.ForeignKey('GenericFamily')
         resource = models.ForeignKey('GenericFamily', on_delete=models.CASCADE)
         name_id = models.CharField(max_length=256)
         family = models.ForeignKey('Family')
         family = models.ForeignKey('Family', on_delete=models.CASCADE)
     class Family(models.Model):
         resource = models.ForeignKey('GenericFamily')
         resource = models.ForeignKey('GenericFamily', on_delete=models.CASCADE)
         external_id = models.CharField(_('External id'),
                     max_length=16, db_index=True)
         login = models.CharField(_('Login'), max_length=64, null=True)
-...
     class Person(models.Model):
         family = models.ForeignKey('Family')
         family = models.ForeignKey('Family', on_delete=models.CASCADE)
         external_id = models.CharField(_('Person\'s external id'), max_length=32,
                         db_index=True)
         first_name = models.CharField(_('First name'), max_length=64)
-...
     class Invoice(models.Model):
         resource = models.ForeignKey('GenericFamily')
         family = models.ForeignKey('Family', null=True)
         resource = models.ForeignKey('GenericFamily', on_delete=models.CASCADE)
         family = models.ForeignKey('Family', null=True, on_delete=models.CASCADE)
         external_id = models.CharField(_('External id'), max_length=128, db_index=True)
         label = models.CharField(_('Label'), max_length=128, null=True)
         issue_date = models.DateField(_('Issue date'), null=True)

     class Form(models.Model):
         resource = models.ForeignKey(Gesbac)
         resource = models.ForeignKey(Gesbac, on_delete=models.CASCADE)
         form_id = models.CharField(max_length=64)
         creation_datetime = models.DateTimeField(auto_now_add=True)
         filename = models.CharField(max_length=128, null=True)

passerelle/apps/jsondatastore/migrations/0002_jsondata_datastore.py
14	14	migrations.AddField(
15	15	model_name='jsondata',
16	16	name='datastore',
17		field=models.ForeignKey(to='jsondatastore.JsonDataStore', null=True),
	17	field=models.ForeignKey(to='jsondatastore.JsonDataStore', null=True, on_delete=models.CASCADE),
18	18	),
19	19	]

     class JsonData(models.Model):
         datastore = models.ForeignKey('JsonDataStore', null=True)
         datastore = models.ForeignKey('JsonDataStore', null=True, on_delete=models.CASCADE)
         uuid = models.CharField(_('uuid'), max_length=32,
                 default=get_hex_uuid, editable=False, unique=True)

             migrations.AddField(
                 model_name='demand',
                 name='resource',
                 field=models.ForeignKey(to='mdel.MDEL'),
                 field=models.ForeignKey(to='mdel.MDEL', on_delete=models.CASCADE),
             ),
             migrations.AlterUniqueTogether(
                 name='demand',

     class Demand(models.Model):
         created_at = models.DateTimeField(auto_now_add=True)
         updated_at = models.DateTimeField(auto_now=True)
         resource = models.ForeignKey(MDEL)
         resource = models.ForeignKey(MDEL, on_delete=models.CASCADE)
         num = models.CharField(
             max_length=64, null=False, primary_key=True, unique=True)
         flow_type = models.CharField(max_length=32, null=False)

     class Call(models.Model):
         resource = models.ForeignKey(PhoneCalls)
         resource = models.ForeignKey(PhoneCalls, on_delete=models.CASCADE)
         callee = models.CharField(blank=False, max_length=64)
         caller = models.CharField(blank=False, max_length=64)
         start_timestamp = models.DateTimeField(auto_now_add=True)

                     ('name_id', models.CharField(max_length=256)),
                     ('user_id', models.CharField(max_length=64)),
                     ('code', models.CharField(max_length=64)),
                     ('resource', models.ForeignKey(to='solis.Solis')),
                     ('resource', models.ForeignKey(to='solis.Solis', on_delete=models.CASCADE)),
                 ],
             ),
+        ]

     class SolisAPALink(models.Model):
         resource = models.ForeignKey(Solis)
         resource = models.ForeignKey(Solis, on_delete=models.CASCADE)
         name_id = models.CharField(blank=False, max_length=256)
         user_id = models.CharField(blank=False, max_length=64)
         code = models.CharField(blank=False, max_length=64)
-...
     class SolisRSALink(models.Model):
         resource = models.ForeignKey(Solis)
         resource = models.ForeignKey(Solis, on_delete=models.CASCADE)
         name_id = models.CharField(blank=False, max_length=256)
         user_id = models.CharField(blank=False, max_length=64)
         code = models.CharField(blank=False, max_length=64)

         resource = models.ForeignKey(
             Resource,
             verbose_name=_('Resource'),
             related_name='mappings')
             related_name='mappings',
             on_delete=models.CASCADE)
         procedure = models.CharField(
             verbose_name=_('Procedure'),
-...
         resource = models.ForeignKey(
             Resource,
             verbose_name=_('Resource'))
             verbose_name=_('Resource'),
             on_delete=models.CASCADE)
         created = models.DateTimeField(
             verbose_name=_('Created'),

             migrations.AddField(
                 model_name='accessright',
                 name='apiuser',
                 field=models.ForeignKey(to='base.ApiUser', verbose_name='API User'),
                 field=models.ForeignKey(to='base.ApiUser', verbose_name='API User', on_delete=models.CASCADE),
                 preserve_default=True,
             ),
             migrations.AddField(
                 model_name='accessright',
                 name='resource_type',
                 field=models.ForeignKey(to='contenttypes.ContentType'),
                 field=models.ForeignKey(to='contenttypes.ContentType', on_delete=models.CASCADE),
                 preserve_default=True,
             ),
+        ]

                     ('start_timestamp', models.DateTimeField(auto_now_add=True)),
                     ('status', models.CharField(default=b'unknown', max_length=20, choices=[(b'unknown', 'Unknown'), (b'up', 'Up'), (b'down', 'Down')])),
                     ('message', models.CharField(max_length=500, blank=True)),
                     ('resource_type', models.ForeignKey(to='contenttypes.ContentType')),
                     ('resource_type', models.ForeignKey(to='contenttypes.ContentType', on_delete=models.CASCADE)),
                 ],
                 options={
                     'ordering': ['-start_timestamp'],

     class AccessRight(models.Model):
         codename = models.CharField(max_length=100, verbose_name='codename')
         resource_type = models.ForeignKey(ContentType)
         resource_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
         resource_pk = models.PositiveIntegerField()
         resource = fields.GenericForeignKey('resource_type', 'resource_pk')
         apiuser = models.ForeignKey(ApiUser, verbose_name=_('API User'))
         apiuser = models.ForeignKey(ApiUser, verbose_name=_('API User'), on_delete=models.CASCADE)
         class Meta:
             permissions = (
-...
     class LoggingParameters(models.Model):
         resource_type = models.ForeignKey(ContentType)
         resource_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
         resource_pk = models.PositiveIntegerField()
         resource = fields.GenericForeignKey('resource_type', 'resource_pk')
         log_level = models.CharField(
-...
     class AvailabilityParameters(models.Model):
         resource_type = models.ForeignKey(ContentType)
         resource_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
         resource_pk = models.PositiveIntegerField()
         resource = fields.GenericForeignKey('resource_type', 'resource_pk')
         run_check = models.BooleanField(
-...
     class Job(models.Model):
         resource_type = models.ForeignKey(ContentType)
         resource_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
         resource_pk = models.PositiveIntegerField()
         resource = fields.GenericForeignKey('resource_type', 'resource_pk')
         method_name = models.CharField(max_length=50)
-...
+    )
     class ResourceStatus(models.Model):
         resource_type = models.ForeignKey(ContentType)
         resource_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
         resource_pk = models.PositiveIntegerField()
         start_timestamp = models.DateTimeField(auto_now_add=True)
         status = models.CharField(max_length=20, choices=STATUS_CHOICES, default='unknown')

                     ('name_id', models.CharField(max_length=256)),
                     ('login', models.CharField(max_length=128)),
                     ('password', models.CharField(max_length=128)),
                     ('resource', models.ForeignKey(to='agoraplus.AgoraPlus')),
                     ('resource', models.ForeignKey(to='agoraplus.AgoraPlus', on_delete=models.CASCADE)),
                 ],
                 options={
                 },

                     ('kind', models.CharField(max_length=16, choices=[(b'ADULT', b'ADULT'), (b'CHILD', b'CHILD'), (b'CONTACT', b'CONTACT')])),
                     ('agoraplus_id', models.CharField(max_length=16, blank=True)),
                     ('value', jsonfield.fields.JSONField(default=dict, blank=True)),
                     ('resource', models.ForeignKey(to='agoraplus.AgoraPlus')),
                     ('resource', models.ForeignKey(to='agoraplus.AgoraPlus', on_delete=models.CASCADE)),
                 ],
                 options={
                 },

         '''
         Link between a Publik user (name_id) and a Agora+ user (login/password)
         '''
         resource = models.ForeignKey(AgoraPlus)
         resource = models.ForeignKey(AgoraPlus, on_delete=models.CASCADE)
         name_id = models.CharField(blank=False, max_length=256)  # Publik user key
         login = models.CharField(blank=False, max_length=128)    # Agora+ user key
         password = models.CharField(blank=False, max_length=128) # Agora+ auth
-...
         '''
         Stores informations before sending in Agora +
         '''
         resource = models.ForeignKey(AgoraPlus)
         resource = models.ForeignKey(AgoraPlus, on_delete=models.CASCADE)
         name_id = models.CharField(blank=False, max_length=256)  # Publik user key
         kind = models.CharField(blank=False, max_length=16, choices=SAS_KIND_OF_VALUES)
         agoraplus_id = models.CharField(blank=True, max_length=16)

                     ('filenumber', models.CharField(max_length=128)),
                     ('badgenumber', models.CharField(max_length=128)),
                     ('cardnumber', models.CharField(max_length=128)),
                     ('resource', models.ForeignKey(to='dpark.DPark')),
                     ('resource', models.ForeignKey(to='dpark.DPark', on_delete=models.CASCADE)),
                 ],
             ),
+        ]

         INFO_CACHE_DURATION = 5 * 60
         PAYMENT_INFO_CACHE_DURATION = 20 * 60
         resource = models.ForeignKey(DPark)
         resource = models.ForeignKey(DPark, on_delete=models.CASCADE)
         nameid = models.CharField(blank=False, max_length=256)
         lastname = models.CharField(blank=False, max_length=128)
         firstnames = models.CharField(blank=False, max_length=128)

         class Meta:
             unique_together = (('resource', 'name_id'), ('resource', 'external_id'),)
         resource = models.ForeignKey(PlanitechConnector)
         resource = models.ForeignKey(PlanitechConnector, on_delete=models.CASCADE)
         name_id = models.CharField(blank=False, max_length=256)
         external_id = models.CharField(blank=False, max_length=256)
         created = models.DateTimeField(auto_now_add=True)

             migrations.AddField(
                 model_name='link',
                 name='resource',
                 field=models.ForeignKey(to='teamnet_axel.Management'),
                 field=models.ForeignKey(to='teamnet_axel.Management', on_delete=models.CASCADE),
                 preserve_default=True,
             ),
+        ]

passerelle/contrib/teamnet_axel/migrations/0006_rename_model_2.py
14	14	migrations.AlterField(
15	15	model_name='link',
16	16	name='resource',
17		field=models.ForeignKey(to='teamnet_axel.TeamnetAxel'),
	17	field=models.ForeignKey(to='teamnet_axel.TeamnetAxel', on_delete=models.CASCADE),
18	18	),
19	19	]

     class Link(models.Model):
         resource = models.ForeignKey(TeamnetAxel)
         resource = models.ForeignKey(TeamnetAxel, on_delete=models.CASCADE)
         nameid = models.CharField(blank=False, max_length=256)
         login = models.CharField(blank=False, max_length=128)
         pwd = models.CharField(blank=False, max_length=128)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-misc-add-explicit-on_delete-on-all-FKs-36608.patch