Projet

Général

Profil

0002-django22-on_delete-on-ForeignKey-and-OneToOne-fields.patch

Nicolas Roche, 15 février 2021 15:41

Télécharger (7,15 ko)

Voir les différences: 

Subject: [PATCH 2/3] django22: on_delete on ForeignKey and OneToOne fields
 (#51125)


 .../migrations/0002_auto_20150413_0629.py                   | 5 +++--
 .../migrations/0004_auto_20150430_0326.py                   | 5 +++--
 .../migrations/0005_street.py                               | 3 ++-
 passerelle_montpellier_encombrants/models.py                | 6 +++---
 4 files changed, 11 insertions(+), 8 deletions(-)
passerelle_montpellier_encombrants/migrations/0002_auto_20150413_0629.py
1 1 
# -*- coding: utf-8 -*-
2 2 
from __future__ import unicode_literals
3 3 

  		




  4
  4
  
    
from django.db import models, migrations

  		




  
  5
  
    
import django.db.models.deletion

  		




  5
  6
  
    

  		




  6
  7
  
    

  		




  7
  8
  
    
class Migration(migrations.Migration):

  		




  8
  9
  
    

  		




  9
  10
  
    
    dependencies = [

  		




  10
  11
  
    
        ('passerelle_montpellier_encombrants', '0001_initial'),

  		




  11
  12
  
    
    ]

  		




  12
  13
  
    

  		




  ......




  47
  48
  
    
                ),

  		




  48
  49
  
    
            ],

  		




  49
  50
  
    
            options={},

  		




  50
  51
  
    
            bases=(models.Model,),

  		




  51
  52
  
    
        ),

  		




  52
  53
  
    
        migrations.AddField(

  		




  53
  54
  
    
            model_name='commune',

  		




  54
  55
  
    
            name='sector',

  		




  55
  
  
    
            field=models.ForeignKey(to='passerelle_montpellier_encombrants.Sector'),

  		




  
  56
  
    
            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='passerelle_montpellier_encombrants.Sector'),

  		




  56
  57
  
    
            preserve_default=True,

  		




  57
  58
  
    
        ),

  		




  58
  59
  
    
        migrations.AddField(

  		




  59
  60
  
    
            model_name='collectday',

  		




  60
  61
  
    
            name='sector',

  		




  61
  
  
    
            field=models.ForeignKey(to='passerelle_montpellier_encombrants.Sector'),

  		




  
  62
  
    
            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='passerelle_montpellier_encombrants.Sector'),

  		




  62
  63
  
    
            preserve_default=True,

  		




  63
  64
  
    
        ),

  		




  64
  65
  
    
    ]

  		












  

    
      passerelle_montpellier_encombrants/migrations/0004_auto_20150430_0326.py
    
  





  1
  1
  
    
# -*- coding: utf-8 -*-

  		




  2
  2
  
    
from __future__ import unicode_literals

  		




  3
  3
  
    

  		




  4
  4
  
    
from django.db import models, migrations

  		




  
  5
  
    
import django.db.models.deletion

  		




  5
  6
  
    

  		




  6
  7
  
    

  		




  7
  8
  
    
class Migration(migrations.Migration):

  		




  8
  9
  
    

  		




  9
  10
  
    
    dependencies = [

  		




  10
  11
  
    
        ('passerelle_montpellier_encombrants', '0003_sector_contact_email'),

  		




  11
  12
  
    
    ]

  		




  12
  13
  
    

  		




  ......




  19
  20
  
    
            model_name='collectday',

  		




  20
  21
  
    
            name='date',

  		




  21
  22
  
    
            field=models.DateField(verbose_name='Date'),

  		




  22
  23
  
    
            preserve_default=True,

  		




  23
  24
  
    
        ),

  		




  24
  25
  
    
        migrations.AlterField(

  		




  25
  26
  
    
            model_name='collectday',

  		




  26
  27
  
    
            name='sector',

  		




  27
  
  
    
            field=models.ForeignKey(verbose_name='Sector', to='passerelle_montpellier_encombrants.Sector'),

  		




  
  28
  
    
            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, verbose_name='Sector', to='passerelle_montpellier_encombrants.Sector'),

  		




  28
  29
  
    
            preserve_default=True,

  		




  29
  30
  
    
        ),

  		




  30
  31
  
    
        migrations.AlterField(

  		




  31
  32
  
    
            model_name='commune',

  		




  32
  33
  
    
            name='insee',

  		




  33
  34
  
    
            field=models.CharField(max_length=10, verbose_name='INSEE Code'),

  		




  34
  35
  
    
            preserve_default=True,

  		




  35
  36
  
    
        ),

  		




  ......




  37
  38
  
    
            model_name='commune',

  		




  38
  39
  
    
            name='name',

  		




  39
  40
  
    
            field=models.CharField(max_length=50, verbose_name='Name'),

  		




  40
  41
  
    
            preserve_default=True,

  		




  41
  42
  
    
        ),

  		




  42
  43
  
    
        migrations.AlterField(

  		




  43
  44
  
    
            model_name='commune',

  		




  44
  45
  
    
            name='sector',

  		




  45
  
  
    
            field=models.ForeignKey(verbose_name='Sector', to='passerelle_montpellier_encombrants.Sector'),

  		




  
  46
  
    
            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, verbose_name='Sector', to='passerelle_montpellier_encombrants.Sector'),

  		




  46
  47
  
    
            preserve_default=True,

  		




  47
  48
  
    
        ),

  		




  48
  49
  
    
    ]

  		












  

    
      passerelle_montpellier_encombrants/migrations/0005_street.py
    
  





  1
  1
  
    
# -*- coding: utf-8 -*-

  		




  2
  2
  
    
from __future__ import unicode_literals

  		




  3
  3
  
    

  		




  4
  4
  
    
from django.db import models, migrations

  		




  
  5
  
    
import django.db.models.deletion

  		




  5
  6
  
    

  		




  6
  7
  
    

  		




  7
  8
  
    
class Migration(migrations.Migration):

  		




  8
  9
  
    

  		




  9
  10
  
    
    dependencies = [

  		




  10
  11
  
    
        ('passerelle_montpellier_encombrants', '0004_auto_20150430_0326'),

  		




  11
  12
  
    
    ]

  		




  12
  13
  
    

  		




  ......




  14
  15
  
    
        migrations.CreateModel(

  		




  15
  16
  
    
            name='Street',

  		




  16
  17
  
    
            fields=[

  		




  17
  18
  
    
                (

  		




  18
  19
  
    
                    'id',

  		




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

  		




  20
  21
  
    
                ),

  		




  21
  22
  
    
                ('name', models.CharField(max_length=128, verbose_name='Street')),

  		




  22
  
  
    
                ('commune', models.ForeignKey(to='passerelle_montpellier_encombrants.Commune')),

  		




  
  23
  
    
                ('commune', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='passerelle_montpellier_encombrants.Commune')),

  		




  23
  24
  
    
            ],

  		




  24
  25
  
    
            options={},

  		




  25
  26
  
    
            bases=(models.Model,),

  		




  26
  27
  
    
        ),

  		




  27
  28
  
    
    ]

  		












  

    
      passerelle_montpellier_encombrants/models.py
    
  





  59
  59
  
    
            return '(%s)' % self.id

  		




  60
  60
  
    
        return ', '.join([x.name for x in communes])

  		




  61
  61
  
    

  		




  62
  62
  
    

  		




  63
  63
  
    
@six.python_2_unicode_compatible

  		




  64
  64
  
    
class Commune(models.Model):

  		




  65
  65
  
    
    name = models.CharField(max_length=50, blank=False, verbose_name=_('Name'))

  		




  66
  66
  
    
    insee = models.CharField(max_length=10, blank=False, verbose_name=_('INSEE Code'))

  		




  67
  
  
    
    sector = models.ForeignKey(Sector, verbose_name=_('Sector'))

  		




  
  67
  
    
    sector = models.ForeignKey(Sector, verbose_name=_('Sector'), on_delete=models.CASCADE)

  		




  68
  68
  
    

  		




  69
  69
  
    
    def __str__(self):

  		




  70
  70
  
    
        return u'%s (%s)' % (self.name, self.insee)

  		




  71
  71
  
    

  		




  72
  72
  
    

  		




  73
  73
  
    
@six.python_2_unicode_compatible

  		




  74
  74
  
    
class Street(models.Model):

  		




  75
  
  
    
    commune = models.ForeignKey(Commune)

  		




  
  75
  
    
    commune = models.ForeignKey(Commune, on_delete=models.CASCADE)

  		




  76
  76
  
    
    name = models.CharField(max_length=128, blank=False, verbose_name=_('Street'))

  		




  77
  77
  
    

  		




  78
  78
  
    
    def __str__(self):

  		




  79
  79
  
    
        return '%s, %s' % (self.name, self.commune)

  		




  80
  80
  
    

  		




  81
  81
  
    

  		




  82
  82
  
    
@six.python_2_unicode_compatible

  		




  83
  83
  
    
class CollectDay(models.Model):

  		




  84
  
  
    
    sector = models.ForeignKey(Sector, verbose_name=_('Sector'))

  		




  
  84
  
    
    sector = models.ForeignKey(Sector, verbose_name=_('Sector'), on_delete=models.CASCADE)

  		




  85
  85
  
    
    date = models.DateField(verbose_name=_('Date'))

  		




  86
  86
  
    

  		




  87
  87
  
    
    class Meta:

  		




  88
  88
  
    
        ordering = ['date']

  		




  89
  89
  
    
        unique_together = ('sector', 'date')

  		




  90
  90
  
    

  		




  91
  91
  
    
    def __str__(self):

  		




  92
  92
  
    
        return '%s: %s' % (self.date, self.sector)

  		




  93
  
  
    
-