general: switch to django postgresql json field (#65265)
This commit is contained in:
parent
b85d822d98
commit
b17cce88f7
|
@ -3,8 +3,8 @@
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
import django.db.models.deletion
|
import django.db.models.deletion
|
||||||
import jsonfield.fields
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
from django.contrib.postgres.fields import JSONField
|
||||||
from django.db import migrations, models
|
from django.db import migrations, models
|
||||||
from django.utils.timezone import utc
|
from django.utils.timezone import utc
|
||||||
|
|
||||||
|
@ -124,7 +124,7 @@ class Migration(migrations.Migration):
|
||||||
models.CharField(max_length=128, null=True, verbose_name='content hash', blank=True),
|
models.CharField(max_length=128, null=True, verbose_name='content hash', blank=True),
|
||||||
),
|
),
|
||||||
('document_type', models.CharField(max_length=256, verbose_name='document type')),
|
('document_type', models.CharField(max_length=256, verbose_name='document type')),
|
||||||
('data', jsonfield.fields.JSONField(null=True, verbose_name='data')),
|
('data', JSONField(null=True, verbose_name='data', default=dict)),
|
||||||
('start', models.DateField(verbose_name='start date')),
|
('start', models.DateField(verbose_name='start date')),
|
||||||
('end', models.DateField(verbose_name='end date')),
|
('end', models.DateField(verbose_name='end date')),
|
||||||
('creator', models.CharField(max_length=256, verbose_name='creator')),
|
('creator', models.CharField(max_length=256, verbose_name='creator')),
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
import jsonfield.fields
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
from django.contrib.postgres.fields import JSONField
|
||||||
from django.db import migrations, models
|
from django.db import migrations, models
|
||||||
from django.utils.timezone import utc
|
from django.utils.timezone import utc
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@ class Migration(migrations.Migration):
|
||||||
models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True),
|
models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True),
|
||||||
),
|
),
|
||||||
('document_type', models.CharField(max_length=256, verbose_name='document type')),
|
('document_type', models.CharField(max_length=256, verbose_name='document type')),
|
||||||
('data', jsonfield.fields.JSONField(null=True, verbose_name='data')),
|
('data', JSONField(null=True, verbose_name='data', default=dict)),
|
||||||
('start', models.DateField(verbose_name='start date')),
|
('start', models.DateField(verbose_name='start date')),
|
||||||
('end', models.DateField(verbose_name='end date')),
|
('end', models.DateField(verbose_name='end date')),
|
||||||
('creator', models.CharField(max_length=256, verbose_name='creator')),
|
('creator', models.CharField(max_length=256, verbose_name='creator')),
|
||||||
|
|
|
@ -22,6 +22,7 @@ import subprocess
|
||||||
import threading
|
import threading
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
from django.contrib.postgres.fields import JSONField
|
||||||
from django.core.files.storage import default_storage
|
from django.core.files.storage import default_storage
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.db.models.signals import post_delete, post_save
|
from django.db.models.signals import post_delete, post_save
|
||||||
|
@ -32,7 +33,6 @@ from django.utils.html import format_html
|
||||||
from django.utils.http import urlquote
|
from django.utils.http import urlquote
|
||||||
from django.utils.text import slugify
|
from django.utils.text import slugify
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from jsonfield import JSONField
|
|
||||||
from sorl.thumbnail import delete, get_thumbnail
|
from sorl.thumbnail import delete, get_thumbnail
|
||||||
from sorl.thumbnail.conf import settings as thumbnail_settings
|
from sorl.thumbnail.conf import settings as thumbnail_settings
|
||||||
|
|
||||||
|
@ -125,7 +125,7 @@ class Validation(models.Model):
|
||||||
content_hash = models.CharField(max_length=128, verbose_name=_('content hash'), blank=True, null=True)
|
content_hash = models.CharField(max_length=128, verbose_name=_('content hash'), blank=True, null=True)
|
||||||
origin = models.ForeignKey(Origin, verbose_name=_('origin'), null=True, on_delete=models.CASCADE)
|
origin = models.ForeignKey(Origin, verbose_name=_('origin'), null=True, on_delete=models.CASCADE)
|
||||||
document_type = models.CharField(max_length=256, verbose_name=_('document type'))
|
document_type = models.CharField(max_length=256, verbose_name=_('document type'))
|
||||||
data = JSONField(null=True, verbose_name=_('data'))
|
data = JSONField(null=True, verbose_name=_('data'), default=dict)
|
||||||
start = models.DateField(verbose_name=_('start date'))
|
start = models.DateField(verbose_name=_('start date'))
|
||||||
end = models.DateField(verbose_name=_('end date'))
|
end = models.DateField(verbose_name=_('end date'))
|
||||||
creator = models.CharField(max_length=256, verbose_name=_('creator'))
|
creator = models.CharField(max_length=256, verbose_name=_('creator'))
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
django>=1.7,<1.9
|
django>=1.7,<1.9
|
||||||
django-tables2<1.1
|
django-tables2<1.1
|
||||||
django-jsonfield >= 0.9.3
|
|
||||||
djangorestframework>=3.3,<3.10
|
djangorestframework>=3.3,<3.10
|
||||||
file-magic
|
file-magic
|
||||||
|
|
1
setup.py
1
setup.py
|
@ -110,7 +110,6 @@ setup(
|
||||||
'django>=2.2,<2.3',
|
'django>=2.2,<2.3',
|
||||||
'gadjo',
|
'gadjo',
|
||||||
'django-tables2>=1.5,<2.2',
|
'django-tables2>=1.5,<2.2',
|
||||||
'django-jsonfield >= 0.9.3',
|
|
||||||
'django-filter>1,<2.5',
|
'django-filter>1,<2.5',
|
||||||
'djangorestframework>=3.4',
|
'djangorestframework>=3.4',
|
||||||
'python-magic',
|
'python-magic',
|
||||||
|
|
Loading…
Reference in New Issue