Projet

Général

Profil

0002-general-switch-to-django-postgresql-json-field-65265.patch

Frédéric Péters, 15 mai 2022 11:43

Télécharger (5,04 ko)

Voir les différences: 

Subject: [PATCH 2/2] general: switch to django postgresql json field (#65265)


 .../fargo/migrations/0001_squashed_0017_auto_20180331_1532.py | 4 ++--
 fargo/fargo/migrations/0003_auto_20150924_1056.py             | 4 ++--
 fargo/fargo/models.py                                         | 4 ++--
 requirements.txt                                              | 1 -
 setup.py                                                      | 1 -
 5 files changed, 6 insertions(+), 8 deletions(-)
fargo/fargo/migrations/0001_squashed_0017_auto_20180331_1532.py
3 3 
import datetime
4 4 

  		




  5
  5
  
    
import django.db.models.deletion

  		




  6
  
  
    
import jsonfield.fields

  		




  7
  6
  
    
from django.conf import settings

  		




  
  7
  
    
from django.contrib.postgres.fields import JSONField

  		




  8
  8
  
    
from django.db import migrations, models

  		




  9
  9
  
    
from django.utils.timezone import utc

  		




  10
  10
  
    

  		




  ......




  124
  124
  
    
                    models.CharField(max_length=128, null=True, verbose_name='content hash', blank=True),

  		




  125
  125
  
    
                ),

  		




  126
  126
  
    
                ('document_type', models.CharField(max_length=256, verbose_name='document type')),

  		




  127
  
  
    
                ('data', jsonfield.fields.JSONField(null=True, verbose_name='data')),

  		




  
  127
  
    
                ('data', JSONField(null=True, verbose_name='data', default=dict)),

  		




  128
  128
  
    
                ('start', models.DateField(verbose_name='start date')),

  		




  129
  129
  
    
                ('end', models.DateField(verbose_name='end date')),

  		




  130
  130
  
    
                ('creator', models.CharField(max_length=256, verbose_name='creator')),

  		












  

    
      fargo/fargo/migrations/0003_auto_20150924_1056.py
    
  





  1
  1
  
    
import datetime

  		




  2
  2
  
    

  		




  3
  
  
    
import jsonfield.fields

  		




  4
  3
  
    
from django.conf import settings

  		




  
  4
  
    
from django.contrib.postgres.fields import JSONField

  		




  5
  5
  
    
from django.db import migrations, models

  		




  6
  6
  
    
from django.utils.timezone import utc

  		




  7
  7
  
    

  		




  ......




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

  		




  49
  49
  
    
                ),

  		




  50
  50
  
    
                ('document_type', models.CharField(max_length=256, verbose_name='document type')),

  		




  51
  
  
    
                ('data', jsonfield.fields.JSONField(null=True, verbose_name='data')),

  		




  
  51
  
    
                ('data', JSONField(null=True, verbose_name='data', default=dict)),

  		




  52
  52
  
    
                ('start', models.DateField(verbose_name='start date')),

  		




  53
  53
  
    
                ('end', models.DateField(verbose_name='end date')),

  		




  54
  54
  
    
                ('creator', models.CharField(max_length=256, verbose_name='creator')),

  		












  

    
      fargo/fargo/models.py
    
  





  22
  22
  
    
import threading

  		




  23
  23
  
    

  		




  24
  24
  
    
from django.conf import settings

  		




  
  25
  
    
from django.contrib.postgres.fields import JSONField

  		




  25
  26
  
    
from django.core.files.storage import default_storage

  		




  26
  27
  
    
from django.db import models

  		




  27
  28
  
    
from django.db.models.signals import post_delete, post_save

  		




  ......




  32
  33
  
    
from django.utils.http import urlquote

  		




  33
  34
  
    
from django.utils.text import slugify

  		




  34
  35
  
    
from django.utils.translation import ugettext_lazy as _

  		




  35
  
  
    
from jsonfield import JSONField

  		




  36
  36
  
    
from sorl.thumbnail import delete, get_thumbnail

  		




  37
  37
  
    
from sorl.thumbnail.conf import settings as thumbnail_settings

  		




  38
  38
  
    

  		




  ......




  125
  125
  
    
    content_hash = models.CharField(max_length=128, verbose_name=_('content hash'), blank=True, null=True)

  		




  126
  126
  
    
    origin = models.ForeignKey(Origin, verbose_name=_('origin'), null=True, on_delete=models.CASCADE)

  		




  127
  127
  
    
    document_type = models.CharField(max_length=256, verbose_name=_('document type'))

  		




  128
  
  
    
    data = JSONField(null=True, verbose_name=_('data'))

  		




  
  128
  
    
    data = JSONField(null=True, verbose_name=_('data'), default=dict)

  		




  129
  129
  
    
    start = models.DateField(verbose_name=_('start date'))

  		




  130
  130
  
    
    end = models.DateField(verbose_name=_('end date'))

  		




  131
  131
  
    
    creator = models.CharField(max_length=256, verbose_name=_('creator'))

  		












  

    
      requirements.txt
    
  





  1
  1
  
    
django>=1.7,<1.9

  		




  2
  2
  
    
django-tables2<1.1

  		




  3
  
  
    
django-jsonfield >= 0.9.3

  		




  4
  3
  
    
djangorestframework>=3.3,<3.10

  		




  5
  4
  
    
file-magic

  		












  

    
      setup.py
    
  





  110
  110
  
    
        'django>=2.2,<2.3',

  		




  111
  111
  
    
        'gadjo',

  		




  112
  112
  
    
        'django-tables2>=1.5,<2.2',

  		




  113
  
  
    
        'django-jsonfield >= 0.9.3',

  		




  114
  113
  
    
        'django-filter>1,<2.5',

  		




  115
  114
  
    
        'djangorestframework>=3.4',

  		




  116
  115
  
    
        'file-magic',

  		




  117
  
  
    
-