From da2964a55e1d10c55ac3acc966baade0e0250407 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Wed, 29 Mar 2023 16:25:17 +0200 Subject: [PATCH] misc: use new JSONField location in migrations (#75442) --- .../apps/atos_genesys/migrations/0001_initial.py | 3 +-- .../migrations/0016_auto_20200130_1604.py | 3 +-- .../migrations/0017_auto_20200504_1402.py | 3 +-- passerelle/apps/bbb/migrations/0001_initial.py | 15 ++++----------- .../migrations/0002_cartadsdatacache.py | 5 ++--- .../0004_cartadsdossier_cartads_steps_cache.py | 5 ++--- .../0011_cartadsdossier_cartads_cache_infos.py | 5 ++--- .../0005_csvdatasource__dialect_options.py | 5 ++--- .../migrations/0006_auto_20160905_1031.py | 5 ++--- .../migrations/0011_auto_20180905_0936.py | 3 +-- .../migrations/0017_auto_20200504_1402.py | 5 ++--- .../franceconnect_data/migrations/0002_token.py | 3 +-- passerelle/apps/gesbac/migrations/0001_initial.py | 5 ++--- .../apps/jsondatastore/migrations/0001_initial.py | 3 +-- .../migrations/0007_auto_20200504_1402.py | 5 ++--- .../apps/mdel_ddpacs/migrations/0001_initial.py | 3 +-- .../migrations/0002_auto_20200504_1402.py | 3 +-- .../apps/opengis/migrations/0008_featurecache.py | 3 +-- .../opengis/migrations/0010_auto_20200504_1402.py | 3 +-- .../migrations/0015_computed_properties.py | 5 ++--- .../migrations/0003_resource_fields_mapping.py | 5 ++--- .../apps/phonecalls/migrations/0001_initial.py | 3 +-- passerelle/apps/photon/migrations/0001_initial.py | 3 +-- passerelle/base/migrations/0005_resourcelog.py | 3 +-- passerelle/base/migrations/0012_job.py | 5 ++--- .../base/migrations/0017_auto_20200310_1806.py | 3 +-- .../fake_family/migrations/0001_initial.py | 5 +---- .../migrations/0005_auto_20200504_1402.py | 7 ++----- .../0002_planitechconnector_custom_fields.py | 7 ++----- .../migrations/0002_management_billing_regies.py | 7 ++----- .../migrations/0008_auto_20200504_1402.py | 5 +---- .../toulouse_foederis/migrations/0001_initial.py | 3 +-- .../migrations/0002_referential.py | 3 +-- .../toulouse_smart/migrations/0001_initial.py | 3 +-- .../migrations/0002_auto_20210806_1242.py | 5 ++--- .../migrations/0003_smartrequest.py | 5 ++--- 36 files changed, 55 insertions(+), 107 deletions(-) diff --git a/passerelle/apps/atos_genesys/migrations/0001_initial.py b/passerelle/apps/atos_genesys/migrations/0001_initial.py index 0d8ab4e6..29c70d79 100644 --- a/passerelle/apps/atos_genesys/migrations/0001_initial.py +++ b/passerelle/apps/atos_genesys/migrations/0001_initial.py @@ -1,6 +1,5 @@ # Generated by Django 1.11.10 on 2018-09-18 09:42 -import django.contrib.postgres.fields.jsonb import django.db.models.deletion from django.db import migrations, models @@ -23,7 +22,7 @@ class Migration(migrations.Migration): ('name_id', models.CharField(max_length=256, verbose_name='NameID')), ('id_per', models.CharField(max_length=64, verbose_name='ID Per')), ('created', models.DateTimeField(auto_now_add=True, verbose_name='Creation date')), - ('extra', django.contrib.postgres.fields.jsonb.JSONField(null=True, verbose_name='Anything')), + ('extra', models.JSONField(null=True, verbose_name='Anything')), ], options={ 'ordering': ['created'], diff --git a/passerelle/apps/base_adresse/migrations/0016_auto_20200130_1604.py b/passerelle/apps/base_adresse/migrations/0016_auto_20200130_1604.py index 7ce1767c..bdeefac9 100644 --- a/passerelle/apps/base_adresse/migrations/0016_auto_20200130_1604.py +++ b/passerelle/apps/base_adresse/migrations/0016_auto_20200130_1604.py @@ -1,6 +1,5 @@ # Generated by Django 1.11.18 on 2020-01-30 15:04 -import django.contrib.postgres.fields.jsonb from django.db import migrations, models @@ -18,7 +17,7 @@ class Migration(migrations.Migration): models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), ), ('api_id', models.CharField(max_length=30, unique=True)), - ('data', django.contrib.postgres.fields.jsonb.JSONField(default=dict)), + ('data', models.JSONField(default=dict)), ('timestamp', models.DateTimeField(auto_now=True)), ], ), diff --git a/passerelle/apps/base_adresse/migrations/0017_auto_20200504_1402.py b/passerelle/apps/base_adresse/migrations/0017_auto_20200504_1402.py index af3bc838..054e495d 100644 --- a/passerelle/apps/base_adresse/migrations/0017_auto_20200504_1402.py +++ b/passerelle/apps/base_adresse/migrations/0017_auto_20200504_1402.py @@ -1,6 +1,5 @@ # Generated by Django 1.11.18 on 2020-05-04 12:02 -import django.contrib.postgres.fields.jsonb from django.db import migrations, models @@ -13,7 +12,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='addresscachemodel', name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(), + field=models.JSONField(), ), migrations.AlterField( model_name='baseadresse', diff --git a/passerelle/apps/bbb/migrations/0001_initial.py b/passerelle/apps/bbb/migrations/0001_initial.py index 6a06d853..3d1c93b4 100644 --- a/passerelle/apps/bbb/migrations/0001_initial.py +++ b/passerelle/apps/bbb/migrations/0001_initial.py @@ -2,7 +2,6 @@ import uuid -import django.contrib.postgres.fields.jsonb import django.db.models.deletion from django.db import migrations, models @@ -101,27 +100,21 @@ class Migration(migrations.Migration): ('last_time_running', models.DateTimeField(null=True, verbose_name='Last time running')), ( 'create_parameters', - django.contrib.postgres.fields.jsonb.JSONField( - null=True, verbose_name='Create parameters' - ), + models.JSONField(null=True, verbose_name='Create parameters'), ), ('user_full_name', models.TextField(null=True, verbose_name='User full name')), ('agent_full_name', models.TextField(null=True, verbose_name='Agent full name')), ( 'join_user_parameters', - django.contrib.postgres.fields.jsonb.JSONField( - null=True, verbose_name='Join user parameters' - ), + models.JSONField(null=True, verbose_name='Join user parameters'), ), ( 'join_agent_parameters', - django.contrib.postgres.fields.jsonb.JSONField( - null=True, verbose_name='Join agent parameters' - ), + models.JSONField(null=True, verbose_name='Join agent parameters'), ), ( 'metadata', - django.contrib.postgres.fields.jsonb.JSONField(null=True, verbose_name='Metadata'), + models.JSONField(null=True, verbose_name='Metadata'), ), ( 'resource', diff --git a/passerelle/apps/cartads_cs/migrations/0002_cartadsdatacache.py b/passerelle/apps/cartads_cs/migrations/0002_cartadsdatacache.py index 20df948f..3e1e670f 100644 --- a/passerelle/apps/cartads_cs/migrations/0002_cartadsdatacache.py +++ b/passerelle/apps/cartads_cs/migrations/0002_cartadsdatacache.py @@ -1,6 +1,5 @@ # Generated by Django 1.11.12 on 2019-08-31 09:48 -import django.contrib.postgres.fields.jsonb from django.db import migrations, models @@ -18,8 +17,8 @@ class Migration(migrations.Migration): models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), ), ('data_type', models.CharField(max_length=50)), - ('data_parameters', django.contrib.postgres.fields.jsonb.JSONField(default=dict)), - ('data_values', django.contrib.postgres.fields.jsonb.JSONField(default=dict)), + ('data_parameters', models.JSONField(default=dict)), + ('data_values', models.JSONField(default=dict)), ('last_update_datetime', models.DateTimeField(auto_now=True)), ], ), diff --git a/passerelle/apps/cartads_cs/migrations/0004_cartadsdossier_cartads_steps_cache.py b/passerelle/apps/cartads_cs/migrations/0004_cartadsdossier_cartads_steps_cache.py index 7d23f621..0e1980f1 100644 --- a/passerelle/apps/cartads_cs/migrations/0004_cartadsdossier_cartads_steps_cache.py +++ b/passerelle/apps/cartads_cs/migrations/0004_cartadsdossier_cartads_steps_cache.py @@ -1,7 +1,6 @@ # Generated by Django 1.11.12 on 2019-09-03 07:19 -import django.contrib.postgres.fields.jsonb -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -13,6 +12,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='cartadsdossier', name='cartads_steps_cache', - field=django.contrib.postgres.fields.jsonb.JSONField(default=dict), + field=models.JSONField(default=dict), ), ] diff --git a/passerelle/apps/cartads_cs/migrations/0011_cartadsdossier_cartads_cache_infos.py b/passerelle/apps/cartads_cs/migrations/0011_cartadsdossier_cartads_cache_infos.py index a691b5c7..d270ff9a 100644 --- a/passerelle/apps/cartads_cs/migrations/0011_cartadsdossier_cartads_cache_infos.py +++ b/passerelle/apps/cartads_cs/migrations/0011_cartadsdossier_cartads_cache_infos.py @@ -1,7 +1,6 @@ # Generated by Django 1.11.12 on 2019-09-30 15:42 -import django.contrib.postgres.fields.jsonb -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -13,6 +12,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='cartadsdossier', name='cartads_cache_infos', - field=django.contrib.postgres.fields.jsonb.JSONField(default=dict), + field=models.JSONField(default=dict), ), ] diff --git a/passerelle/apps/csvdatasource/migrations/0005_csvdatasource__dialect_options.py b/passerelle/apps/csvdatasource/migrations/0005_csvdatasource__dialect_options.py index f561b9e2..d5480f7a 100644 --- a/passerelle/apps/csvdatasource/migrations/0005_csvdatasource__dialect_options.py +++ b/passerelle/apps/csvdatasource/migrations/0005_csvdatasource__dialect_options.py @@ -1,5 +1,4 @@ -import django.contrib.postgres.fields.jsonb -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -11,7 +10,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='csvdatasource', name='_dialect_options', - field=django.contrib.postgres.fields.jsonb.JSONField(default=dict, editable=False), + field=models.JSONField(default=dict, editable=False), preserve_default=True, ), ] diff --git a/passerelle/apps/csvdatasource/migrations/0006_auto_20160905_1031.py b/passerelle/apps/csvdatasource/migrations/0006_auto_20160905_1031.py index 3c68e382..f2eafa2e 100644 --- a/passerelle/apps/csvdatasource/migrations/0006_auto_20160905_1031.py +++ b/passerelle/apps/csvdatasource/migrations/0006_auto_20160905_1031.py @@ -1,5 +1,4 @@ -import django.contrib.postgres.fields.jsonb -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -15,6 +14,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='csvdatasource', name='_dialect_options', - field=django.contrib.postgres.fields.jsonb.JSONField(null=True, editable=False), + field=models.JSONField(null=True, editable=False), ), ] diff --git a/passerelle/apps/csvdatasource/migrations/0011_auto_20180905_0936.py b/passerelle/apps/csvdatasource/migrations/0011_auto_20180905_0936.py index e2307330..e81df750 100644 --- a/passerelle/apps/csvdatasource/migrations/0011_auto_20180905_0936.py +++ b/passerelle/apps/csvdatasource/migrations/0011_auto_20180905_0936.py @@ -1,6 +1,5 @@ # Generated by Django 1.11.12 on 2018-09-05 14:36 -import django.contrib.postgres.fields.jsonb import django.db.models.deletion from django.db import migrations, models @@ -19,7 +18,7 @@ class Migration(migrations.Migration): models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), ), ('line_number', models.IntegerField()), - ('data', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict)), + ('data', models.JSONField(blank=True, default=dict)), ], options={ 'ordering': ('line_number',), diff --git a/passerelle/apps/csvdatasource/migrations/0017_auto_20200504_1402.py b/passerelle/apps/csvdatasource/migrations/0017_auto_20200504_1402.py index 9d645514..4c6e9b07 100644 --- a/passerelle/apps/csvdatasource/migrations/0017_auto_20200504_1402.py +++ b/passerelle/apps/csvdatasource/migrations/0017_auto_20200504_1402.py @@ -1,7 +1,6 @@ # Generated by Django 1.11.18 on 2020-05-04 12:02 -import django.contrib.postgres.fields.jsonb -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -13,6 +12,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='tablerow', name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True), + field=models.JSONField(blank=True), ), ] diff --git a/passerelle/apps/franceconnect_data/migrations/0002_token.py b/passerelle/apps/franceconnect_data/migrations/0002_token.py index a9708e16..64d42940 100644 --- a/passerelle/apps/franceconnect_data/migrations/0002_token.py +++ b/passerelle/apps/franceconnect_data/migrations/0002_token.py @@ -2,7 +2,6 @@ import uuid -import django.contrib.postgres.fields.jsonb from django.db import migrations, models @@ -22,7 +21,7 @@ class Migration(migrations.Migration): ), ), ('timestamp', models.DateTimeField(auto_now_add=True, verbose_name='Timestamp')), - ('content', django.contrib.postgres.fields.jsonb.JSONField(verbose_name='Content')), + ('content', models.JSONField(verbose_name='Content')), ], options={ 'verbose_name': 'FranceConnect data token', diff --git a/passerelle/apps/gesbac/migrations/0001_initial.py b/passerelle/apps/gesbac/migrations/0001_initial.py index af01f024..e0fa6b18 100644 --- a/passerelle/apps/gesbac/migrations/0001_initial.py +++ b/passerelle/apps/gesbac/migrations/0001_initial.py @@ -1,6 +1,5 @@ # Generated by Django 1.11.20 on 2019-09-19 15:23 -import django.contrib.postgres.fields.jsonb import django.db.models.deletion from django.db import migrations, models @@ -33,8 +32,8 @@ class Migration(migrations.Migration): max_length=8, ), ), - ('demand_data', django.contrib.postgres.fields.jsonb.JSONField(default=dict)), - ('card_data', django.contrib.postgres.fields.jsonb.JSONField(default=dict)), + ('demand_data', models.JSONField(default=dict)), + ('card_data', models.JSONField(default=dict)), ], options={ 'get_latest_by': 'creation_datetime', diff --git a/passerelle/apps/jsondatastore/migrations/0001_initial.py b/passerelle/apps/jsondatastore/migrations/0001_initial.py index e7f3e91d..1deb2123 100644 --- a/passerelle/apps/jsondatastore/migrations/0001_initial.py +++ b/passerelle/apps/jsondatastore/migrations/0001_initial.py @@ -1,4 +1,3 @@ -import django.contrib.postgres.fields.jsonb from django.db import migrations, models import passerelle.apps.jsondatastore.models @@ -30,7 +29,7 @@ class Migration(migrations.Migration): ('name_id', models.CharField(max_length=256, blank=True)), ( 'content', - django.contrib.postgres.fields.jsonb.JSONField(default=dict, verbose_name='Content'), + models.JSONField(default=dict, verbose_name='Content'), ), ('creation_datetime', models.DateTimeField(auto_now_add=True)), ('last_update_datetime', models.DateTimeField(auto_now=True)), diff --git a/passerelle/apps/jsondatastore/migrations/0007_auto_20200504_1402.py b/passerelle/apps/jsondatastore/migrations/0007_auto_20200504_1402.py index ec71cb8e..e63200ba 100644 --- a/passerelle/apps/jsondatastore/migrations/0007_auto_20200504_1402.py +++ b/passerelle/apps/jsondatastore/migrations/0007_auto_20200504_1402.py @@ -1,7 +1,6 @@ # Generated by Django 1.11.18 on 2020-05-04 12:02 -import django.contrib.postgres.fields.jsonb -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -13,6 +12,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='jsondata', name='content', - field=django.contrib.postgres.fields.jsonb.JSONField(verbose_name='Content'), + field=models.JSONField(verbose_name='Content'), ), ] diff --git a/passerelle/apps/mdel_ddpacs/migrations/0001_initial.py b/passerelle/apps/mdel_ddpacs/migrations/0001_initial.py index 8f8d6985..836f78b5 100644 --- a/passerelle/apps/mdel_ddpacs/migrations/0001_initial.py +++ b/passerelle/apps/mdel_ddpacs/migrations/0001_initial.py @@ -1,6 +1,5 @@ # Generated by Django 1.11.20 on 2019-10-24 08:59 -import django.contrib.postgres.fields.jsonb import django.db.models.deletion from django.db import migrations, models @@ -46,7 +45,7 @@ class Migration(migrations.Migration): ), ), ('step', models.IntegerField(default=0)), - ('data', django.contrib.postgres.fields.jsonb.JSONField(default=dict)), + ('data', models.JSONField(default=dict)), ], options={ 'verbose_name': 'MDEL compatible DDPACS request', diff --git a/passerelle/apps/mdel_ddpacs/migrations/0002_auto_20200504_1402.py b/passerelle/apps/mdel_ddpacs/migrations/0002_auto_20200504_1402.py index ca55c2ce..e6e365b8 100644 --- a/passerelle/apps/mdel_ddpacs/migrations/0002_auto_20200504_1402.py +++ b/passerelle/apps/mdel_ddpacs/migrations/0002_auto_20200504_1402.py @@ -1,6 +1,5 @@ # Generated by Django 1.11.18 on 2020-05-04 12:02 -import django.contrib.postgres.fields.jsonb from django.db import migrations, models import passerelle.utils.sftp @@ -19,7 +18,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='demand', name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(), + field=models.JSONField(), ), migrations.AlterField( model_name='demand', diff --git a/passerelle/apps/opengis/migrations/0008_featurecache.py b/passerelle/apps/opengis/migrations/0008_featurecache.py index 27740a7e..5efecdb3 100644 --- a/passerelle/apps/opengis/migrations/0008_featurecache.py +++ b/passerelle/apps/opengis/migrations/0008_featurecache.py @@ -1,6 +1,5 @@ # Generated by Django 1.11.18 on 2020-04-01 09:21 -import django.contrib.postgres.fields.jsonb import django.db.models.deletion from django.db import migrations, models @@ -20,7 +19,7 @@ class Migration(migrations.Migration): ), ('lat', models.FloatField()), ('lon', models.FloatField()), - ('data', django.contrib.postgres.fields.jsonb.JSONField(default=dict)), + ('data', models.JSONField(default=dict)), ( 'query', models.ForeignKey( diff --git a/passerelle/apps/opengis/migrations/0010_auto_20200504_1402.py b/passerelle/apps/opengis/migrations/0010_auto_20200504_1402.py index d2348d4d..57816189 100644 --- a/passerelle/apps/opengis/migrations/0010_auto_20200504_1402.py +++ b/passerelle/apps/opengis/migrations/0010_auto_20200504_1402.py @@ -1,6 +1,5 @@ # Generated by Django 1.11.18 on 2020-05-04 12:02 -import django.contrib.postgres.fields.jsonb from django.db import migrations, models @@ -17,7 +16,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='featurecache', name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(), + field=models.JSONField(), ), migrations.AlterField( model_name='opengis', diff --git a/passerelle/apps/opengis/migrations/0015_computed_properties.py b/passerelle/apps/opengis/migrations/0015_computed_properties.py index 55a48e30..53e694d4 100644 --- a/passerelle/apps/opengis/migrations/0015_computed_properties.py +++ b/passerelle/apps/opengis/migrations/0015_computed_properties.py @@ -1,5 +1,4 @@ -import django.contrib.postgres.fields.jsonb -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -11,6 +10,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='query', name='computed_properties', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + field=models.JSONField(blank=True, default=dict), ), ] diff --git a/passerelle/apps/pdf/migrations/0003_resource_fields_mapping.py b/passerelle/apps/pdf/migrations/0003_resource_fields_mapping.py index 5c9379ee..9b2adecb 100644 --- a/passerelle/apps/pdf/migrations/0003_resource_fields_mapping.py +++ b/passerelle/apps/pdf/migrations/0003_resource_fields_mapping.py @@ -1,7 +1,6 @@ # Generated by Django 3.2.18 on 2023-03-01 16:48 -from django.contrib.postgres.fields.jsonb import JSONField -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -13,6 +12,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='resource', name='fields_mapping', - field=JSONField(null=True, verbose_name='Field mapping', blank=True), + field=models.JSONField(null=True, verbose_name='Field mapping', blank=True), ), ] diff --git a/passerelle/apps/phonecalls/migrations/0001_initial.py b/passerelle/apps/phonecalls/migrations/0001_initial.py index ca30ce82..337898a5 100644 --- a/passerelle/apps/phonecalls/migrations/0001_initial.py +++ b/passerelle/apps/phonecalls/migrations/0001_initial.py @@ -1,6 +1,5 @@ # Generated by Django 1.11.17 on 2019-01-21 14:14 -import django.contrib.postgres.fields.jsonb import django.db.models.deletion from django.db import migrations, models @@ -24,7 +23,7 @@ class Migration(migrations.Migration): ('caller', models.CharField(max_length=64)), ('start_timestamp', models.DateTimeField(auto_now_add=True)), ('end_timestamp', models.DateTimeField(default=None, null=True)), - ('details', django.contrib.postgres.fields.jsonb.JSONField(default=dict)), + ('details', models.JSONField(default=dict)), ], options={ 'ordering': ['-start_timestamp'], diff --git a/passerelle/apps/photon/migrations/0001_initial.py b/passerelle/apps/photon/migrations/0001_initial.py index e2eb3039..69ca1849 100644 --- a/passerelle/apps/photon/migrations/0001_initial.py +++ b/passerelle/apps/photon/migrations/0001_initial.py @@ -1,6 +1,5 @@ # Generated by Django 1.11.18 on 2021-02-07 22:48 -import django.contrib.postgres.fields.jsonb from django.db import migrations, models @@ -20,7 +19,7 @@ class Migration(migrations.Migration): models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), ), ('api_id', models.CharField(max_length=32, unique=True)), - ('data', django.contrib.postgres.fields.jsonb.JSONField()), + ('data', models.JSONField()), ('timestamp', models.DateTimeField(auto_now=True)), ], ), diff --git a/passerelle/base/migrations/0005_resourcelog.py b/passerelle/base/migrations/0005_resourcelog.py index 35ebcc2e..f916e268 100644 --- a/passerelle/base/migrations/0005_resourcelog.py +++ b/passerelle/base/migrations/0005_resourcelog.py @@ -1,4 +1,3 @@ -import django.contrib.postgres.fields.jsonb from django.db import migrations, models @@ -21,7 +20,7 @@ class Migration(migrations.Migration): ('levelno', models.IntegerField(verbose_name=b'log level')), ('sourceip', models.GenericIPAddressField(null=True, verbose_name='Source IP', blank=True)), ('message', models.TextField(verbose_name=b'message')), - ('extra', django.contrib.postgres.fields.jsonb.JSONField(default={}, verbose_name=b'extras')), + ('extra', models.JSONField(default={}, verbose_name=b'extras')), ], options={ 'permissions': (('see_resourcelog', 'Can see resource logs'),), diff --git a/passerelle/base/migrations/0012_job.py b/passerelle/base/migrations/0012_job.py index cc0196c8..3f6524d6 100644 --- a/passerelle/base/migrations/0012_job.py +++ b/passerelle/base/migrations/0012_job.py @@ -1,6 +1,5 @@ # Generated by Django 1.11.12 on 2019-02-20 09:00 -import django.contrib.postgres.fields.jsonb import django.db.models.deletion from django.db import migrations, models @@ -22,7 +21,7 @@ class Migration(migrations.Migration): ('resource_pk', models.PositiveIntegerField()), ('method_name', models.CharField(max_length=50)), ('natural_id', models.CharField(blank=True, max_length=256, null=True)), - ('parameters', django.contrib.postgres.fields.jsonb.JSONField(default=dict)), + ('parameters', models.JSONField(default=dict)), ('creation_timestamp', models.DateTimeField(auto_now_add=True)), ('update_timestamp', models.DateTimeField(auto_now=True)), ('done_timestamp', models.DateTimeField(null=True)), @@ -39,7 +38,7 @@ class Migration(migrations.Migration): max_length=20, ), ), - ('status_details', django.contrib.postgres.fields.jsonb.JSONField(default=dict)), + ('status_details', models.JSONField(default=dict)), ( 'resource_type', models.ForeignKey( diff --git a/passerelle/base/migrations/0017_auto_20200310_1806.py b/passerelle/base/migrations/0017_auto_20200310_1806.py index 7ea71351..4d8e3751 100644 --- a/passerelle/base/migrations/0017_auto_20200310_1806.py +++ b/passerelle/base/migrations/0017_auto_20200310_1806.py @@ -1,6 +1,5 @@ # Generated by Django 1.11.18 on 2020-03-10 17:06 -import django.contrib.postgres.fields.jsonb from django.db import migrations, models import passerelle.base.models @@ -75,7 +74,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='resourcelog', name='extra', - field=django.contrib.postgres.fields.jsonb.JSONField(default=dict, verbose_name='extras'), + field=models.JSONField(default=dict, verbose_name='extras'), ), migrations.AlterField( model_name='resourcelog', diff --git a/passerelle/contrib/fake_family/migrations/0001_initial.py b/passerelle/contrib/fake_family/migrations/0001_initial.py index 109d1434..6942cc26 100644 --- a/passerelle/contrib/fake_family/migrations/0001_initial.py +++ b/passerelle/contrib/fake_family/migrations/0001_initial.py @@ -1,4 +1,3 @@ -import django.contrib.postgres.fields.jsonb from django.db import migrations, models @@ -20,9 +19,7 @@ class Migration(migrations.Migration): ('description', models.TextField(verbose_name='Description')), ( 'jsondatabase', - django.contrib.postgres.fields.jsonb.JSONField( - default=dict, verbose_name='Fake Database (JSON)', blank=True - ), + models.JSONField(default=dict, verbose_name='Fake Database (JSON)', blank=True), ), ( 'users', diff --git a/passerelle/contrib/fake_family/migrations/0005_auto_20200504_1402.py b/passerelle/contrib/fake_family/migrations/0005_auto_20200504_1402.py index e09c74f4..7009919a 100644 --- a/passerelle/contrib/fake_family/migrations/0005_auto_20200504_1402.py +++ b/passerelle/contrib/fake_family/migrations/0005_auto_20200504_1402.py @@ -1,7 +1,6 @@ # Generated by Django 1.11.18 on 2020-05-04 12:02 -import django.contrib.postgres.fields.jsonb -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -13,8 +12,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='fakefamily', name='jsondatabase', - field=django.contrib.postgres.fields.jsonb.JSONField( - blank=True, verbose_name='Fake Database (JSON)' - ), + field=models.JSONField(blank=True, verbose_name='Fake Database (JSON)'), ), ] diff --git a/passerelle/contrib/planitech/migrations/0002_planitechconnector_custom_fields.py b/passerelle/contrib/planitech/migrations/0002_planitechconnector_custom_fields.py index 429958a7..fc4dd7a8 100644 --- a/passerelle/contrib/planitech/migrations/0002_planitechconnector_custom_fields.py +++ b/passerelle/contrib/planitech/migrations/0002_planitechconnector_custom_fields.py @@ -1,7 +1,6 @@ # Generated by Django 1.11.17 on 2019-01-08 11:22 -import django.contrib.postgres.fields.jsonb -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -13,8 +12,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='planitechconnector', name='custom_fields', - field=django.contrib.postgres.fields.jsonb.JSONField( - blank=True, null=True, verbose_name='Custom places fields' - ), + field=models.JSONField(blank=True, null=True, verbose_name='Custom places fields'), ), ] diff --git a/passerelle/contrib/teamnet_axel/migrations/0002_management_billing_regies.py b/passerelle/contrib/teamnet_axel/migrations/0002_management_billing_regies.py index 08038248..e4ac5ff4 100644 --- a/passerelle/contrib/teamnet_axel/migrations/0002_management_billing_regies.py +++ b/passerelle/contrib/teamnet_axel/migrations/0002_management_billing_regies.py @@ -1,5 +1,4 @@ -import django.contrib.postgres.fields.jsonb -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -11,9 +10,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='management', name='billing_regies', - field=django.contrib.postgres.fields.jsonb.JSONField( - default=dict, verbose_name='Mapping between regie ids and billing ids' - ), + field=models.JSONField(default=dict, verbose_name='Mapping between regie ids and billing ids'), preserve_default=True, ), ] diff --git a/passerelle/contrib/teamnet_axel/migrations/0008_auto_20200504_1402.py b/passerelle/contrib/teamnet_axel/migrations/0008_auto_20200504_1402.py index ee097796..30d65385 100644 --- a/passerelle/contrib/teamnet_axel/migrations/0008_auto_20200504_1402.py +++ b/passerelle/contrib/teamnet_axel/migrations/0008_auto_20200504_1402.py @@ -1,6 +1,5 @@ # Generated by Django 1.11.18 on 2020-05-04 12:02 -import django.contrib.postgres.fields.jsonb from django.db import migrations, models @@ -13,9 +12,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='teamnetaxel', name='billing_regies', - field=django.contrib.postgres.fields.jsonb.JSONField( - verbose_name='Mapping between regie ids and billing ids' - ), + field=models.JSONField(verbose_name='Mapping between regie ids and billing ids'), ), migrations.AlterField( model_name='teamnetaxel', diff --git a/passerelle/contrib/toulouse_foederis/migrations/0001_initial.py b/passerelle/contrib/toulouse_foederis/migrations/0001_initial.py index e821df9d..7a7ca45e 100644 --- a/passerelle/contrib/toulouse_foederis/migrations/0001_initial.py +++ b/passerelle/contrib/toulouse_foederis/migrations/0001_initial.py @@ -1,6 +1,5 @@ # Generated by Django 2.2.24 on 2022-04-19 13:14 -import django.contrib.postgres.fields.jsonb import django.db.models.deletion from django.db import migrations, models @@ -81,7 +80,7 @@ class Migration(migrations.Migration): ), ('external_id', models.CharField(max_length=64, unique=True, verbose_name='Key')), ('text', models.CharField(max_length=64, null=True, verbose_name='Text')), - ('data', django.contrib.postgres.fields.jsonb.JSONField(null=True, verbose_name='Data')), + ('data', models.JSONField(null=True, verbose_name='Data')), ( 'pdf', models.FileField( diff --git a/passerelle/contrib/toulouse_maelis/migrations/0002_referential.py b/passerelle/contrib/toulouse_maelis/migrations/0002_referential.py index 903f0162..c7dde1f2 100644 --- a/passerelle/contrib/toulouse_maelis/migrations/0002_referential.py +++ b/passerelle/contrib/toulouse_maelis/migrations/0002_referential.py @@ -1,6 +1,5 @@ # Generated by Django 2.2.26 on 2022-12-08 16:05 -import django.contrib.postgres.fields.jsonb import django.core.serializers.json import django.db.models.deletion from django.db import migrations, models @@ -24,7 +23,7 @@ class Migration(migrations.Migration): ('item_text', models.CharField(max_length=128, verbose_name='Text')), ( 'item_data', - django.contrib.postgres.fields.jsonb.JSONField( + models.JSONField( encoder=django.core.serializers.json.DjangoJSONEncoder, verbose_name='Data' ), ), diff --git a/passerelle/contrib/toulouse_smart/migrations/0001_initial.py b/passerelle/contrib/toulouse_smart/migrations/0001_initial.py index e400bd05..ab70a9cc 100644 --- a/passerelle/contrib/toulouse_smart/migrations/0001_initial.py +++ b/passerelle/contrib/toulouse_smart/migrations/0001_initial.py @@ -1,6 +1,5 @@ # Generated by Django 2.2.19 on 2021-05-06 22:50 -import django.contrib.postgres.fields.jsonb import django.db.models.deletion from django.db import migrations, models @@ -77,7 +76,7 @@ class Migration(migrations.Migration): ), ('key', models.CharField(max_length=64, verbose_name='Key')), ('timestamp', models.DateTimeField(auto_now=True, verbose_name='Timestamp')), - ('value', django.contrib.postgres.fields.jsonb.JSONField(default=dict, verbose_name='Value')), + ('value', models.JSONField(default=dict, verbose_name='Value')), ( 'resource', models.ForeignKey( diff --git a/passerelle/contrib/toulouse_smart/migrations/0002_auto_20210806_1242.py b/passerelle/contrib/toulouse_smart/migrations/0002_auto_20210806_1242.py index b34724dd..6249392b 100644 --- a/passerelle/contrib/toulouse_smart/migrations/0002_auto_20210806_1242.py +++ b/passerelle/contrib/toulouse_smart/migrations/0002_auto_20210806_1242.py @@ -2,7 +2,6 @@ import uuid -import django.contrib.postgres.fields.jsonb import django.db.models.deletion from django.db import migrations, models @@ -19,8 +18,8 @@ class Migration(migrations.Migration): ('wcs_form_api_url', models.CharField(max_length=256, primary_key=True, serialize=False)), ('wcs_form_number', models.CharField(max_length=16)), ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, unique=True)), - ('payload', django.contrib.postgres.fields.jsonb.JSONField(null=True)), - ('result', django.contrib.postgres.fields.jsonb.JSONField(null=True)), + ('payload', models.JSONField(null=True)), + ('result', models.JSONField(null=True)), ( 'status', models.CharField( diff --git a/passerelle/contrib/toulouse_smart/migrations/0003_smartrequest.py b/passerelle/contrib/toulouse_smart/migrations/0003_smartrequest.py index 6aca30f6..1a618df8 100644 --- a/passerelle/contrib/toulouse_smart/migrations/0003_smartrequest.py +++ b/passerelle/contrib/toulouse_smart/migrations/0003_smartrequest.py @@ -1,6 +1,5 @@ # Generated by Django 1.11.29 on 2021-08-06 10:46 -import django.contrib.postgres.fields.jsonb import django.db.models.deletion from django.db import migrations, models @@ -18,8 +17,8 @@ class Migration(migrations.Migration): 'id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), ), - ('payload', django.contrib.postgres.fields.jsonb.JSONField()), - ('result', django.contrib.postgres.fields.jsonb.JSONField(null=True)), + ('payload', models.JSONField()), + ('result', models.JSONField(null=True)), ( 'resource', models.ForeignKey( -- 2.39.2