0002-django.contrib.postgres-s-JSONField-is-deprecated-71.patch

Benjamin Dauvergne, 23 November 2022 04:24 PM

View differences: inline side by side

Subject: [PATCH 2/2] django.contrib.postgres's JSONField is deprecated
 (#71619)

 .../apps/journal/migrations/0001_initial.py        |  8 ++++++--
 src/authentic2/apps/journal/models.py              |  7 ++++++-
 .../custom_user/migrations/0020_deleteduser.py     | 10 ++++++----
 .../migrations/0029_profile_profiletype.py         | 10 ++++++----
 src/authentic2/custom_user/models.py               |  6 +++++-
 src/authentic2/migrations/0026_token.py            |  8 ++++++--
 src/authentic2/models.py                           |  8 ++++++--
 .../migrations/0001_initial.py                     |  8 ++++++--
 src/authentic2_auth_oidc/models.py                 |  6 +++++-
 .../migrations/0001_initial.py                     | 14 +++++++++-----
 src/authentic2_auth_saml/models.py                 |  6 +++++-
 11 files changed, 66 insertions(+), 25 deletions(-)

     # Generated by Django 2.2.15 on 2020-08-23 16:56
     import django.contrib.postgres.fields
     import django.contrib.postgres.fields.jsonb
     import django.db.models.deletion
     from django.conf import settings
     from django.db import migrations, models
     from django.utils import timezone
     try:
         from django.db.models import JSONField
     except ImportError:
         from django.contrib.postgres.fields.jsonb import JSONField
     class Migration(migrations.Migration):
-...
                             verbose_name='reference ct ids',
                         ),
                     ),
                     ('data', django.contrib.postgres.fields.jsonb.JSONField(null=True, verbose_name='data')),
                     ('data', JSONField(null=True, verbose_name='data')),
+                    (
                         'session',
                         models.ForeignKey(

     from django.conf import settings
     from django.contrib.auth import get_user_model
     from django.contrib.contenttypes.models import ContentType
     from django.contrib.postgres.fields import ArrayField, JSONField
     from django.contrib.postgres.fields import ArrayField
     from django.contrib.postgres.fields.jsonb import KeyTextTransform
     from django.core.exceptions import ObjectDoesNotExist
     from django.db import models
     from django.db.models import Count, F, Q, QuerySet, Value
     try:
         from django.db.models import JSONField
     except ImportError:
         from django.contrib.postgres.fields import JSONField
     from django.db.models.functions import Trunc
     from django.utils.timezone import now, utc
     from django.utils.translation import gettext_lazy as _

     # Generated by Django 2.2.12 on 2020-05-05 14:16
     import django.contrib.postgres.fields.jsonb
     from django.db import migrations, models
     try:
         from django.db.models import JSONField
     except ImportError:
         from django.contrib.postgres.fields.jsonb import JSONField
     class Migration(migrations.Migration):
-...
                     ),
+                    (
                         'old_data',
                         django.contrib.postgres.fields.jsonb.JSONField(
                             blank=True, null=True, verbose_name='Old data'
                         ),
                         JSONField(blank=True, null=True, verbose_name='Old data'),
                     ),
                 ],
                 options={

     import uuid
     import django.contrib.postgres.fields.jsonb
     import django.db.models.deletion
     from django.conf import settings
     from django.db import migrations, models
     try:
         from django.db.models import JSONField
     except ImportError:
         from django.contrib.postgres.fields.jsonb import JSONField
     class Migration(migrations.Migration):
-...
                     ),
+                    (
                         'data',
                         django.contrib.postgres.fields.jsonb.JSONField(
                             blank=True, null=True, verbose_name='data'
                         ),
                         JSONField(blank=True, null=True, verbose_name='data'),
                     ),
+                    (
                         'profile_type',

     from django.contrib.auth.models import Permission as AuthPermission
     from django.contrib.auth.models import _user_has_module_perms, _user_has_perm
     from django.contrib.contenttypes.fields import GenericRelation
     from django.contrib.postgres.fields import JSONField
     from django.core.exceptions import MultipleObjectsReturned, ValidationError
     from django.core.mail import send_mail
     from django.db import models, transaction
     from django.db.models import Q
     try:
         from django.db.models import JSONField
     except ImportError:
         from django.contrib.postgres.fields import JSONField
     from django.urls import reverse
     from django.utils import timezone
     from django.utils.translation import gettext_lazy as _

     import uuid
     import django.contrib.postgres.fields.jsonb
     from django.db import migrations, models
     try:
         from django.db.models import JSONField
     except ImportError:
         from django.contrib.postgres.fields.jsonb import JSONField
     class Migration(migrations.Migration):
-...
                     ('kind', models.CharField(max_length=32, verbose_name='Kind')),
+                    (
                         'content',
                         django.contrib.postgres.fields.jsonb.JSONField(blank=True, verbose_name='Content'),
                         JSONField(blank=True, verbose_name='Content'),
                     ),
                     ('created', models.DateTimeField(verbose_name='Creation date', auto_now_add=True)),
                     ('expires', models.DateTimeField(verbose_name='Expires')),

     from django.contrib import auth
     from django.contrib.contenttypes.fields import GenericForeignKey
     from django.contrib.contenttypes.models import ContentType
     from django.contrib.postgres.fields import jsonb
     from django.contrib.postgres.indexes import GinIndex
     from django.contrib.postgres.search import SearchVectorField
     from django.core.exceptions import PermissionDenied, ValidationError
     from django.db import DatabaseError, models, transaction
     from django.db.models.query import Q
     try:
         from django.db.models import JSONField
     except ImportError:
         from django.contrib.postgres.fields import JSONField
     from django.urls import reverse
     from django.utils import timezone
     from django.utils.http import urlquote
-...
             verbose_name=_('Identifier'), primary_key=True, default=uuid.uuid4, editable=False
+        )
         kind = models.CharField(verbose_name=_('Kind'), max_length=32)
         content = jsonb.JSONField(verbose_name=_('Content'), blank=True)
         content = JSONField(verbose_name=_('Content'), blank=True)
         created = models.DateTimeField(verbose_name=_('Creation date'), auto_now_add=True)
         expires = models.DateTimeField(verbose_name=_('Expires'))

     import django.contrib.postgres.fields.jsonb
     from django.conf import settings
     from django.db import migrations, models
     try:
         from django.db.models import JSONField
     except ImportError:
         from django.contrib.postgres.fields.jsonb import JSONField
     import authentic2_auth_oidc.models
-...
                     ('scopes', models.CharField(max_length=128, verbose_name='scopes', blank=True)),
+                    (
                         'jwkset_json',
                         django.contrib.postgres.fields.jsonb.JSONField(
                         JSONField(
                             blank=True,
                             null=True,
                             verbose_name='JSON WebKey set',

     import json
     from django.conf import settings
     from django.contrib.postgres.fields import JSONField
     from django.core.exceptions import ValidationError
     from django.db import models
     try:
         from django.db.models import JSONField
     except ImportError:
         from django.contrib.postgres.fields import JSONField
     from django.shortcuts import render
     from django.utils.translation import gettext_lazy as _
     from django.utils.translation import pgettext_lazy

     # Generated by Django 2.2.26 on 2022-06-15 15:00
     import django.contrib.postgres.fields.jsonb
     import django.db.models.deletion
     from django.db import migrations, models
     try:
         from django.db.models import JSONField
     except ImportError:
         from django.contrib.postgres.fields.jsonb import JSONField
     import authentic2_auth_saml.models
     from authentic2_auth_saml.models import NAME_ID_FORMAT_CHOICES
-...
                     ),
+                    (
                         'lookup_by_attributes',
                         django.contrib.postgres.fields.jsonb.JSONField(
                         JSONField(
                             blank=True,
                             default=list,
                             help_text=(
-...
                     ),
+                    (
                         'a2_attribute_mapping',
                         django.contrib.postgres.fields.jsonb.JSONField(
                         JSONField(
                             blank=True,
                             default=list,
                             help_text=(
-...
                     ),
+                    (
                         'attribute_mapping',
                         django.contrib.postgres.fields.jsonb.JSONField(
                         JSONField(
                             blank=True,
                             default=dict,
                             help_text=(
-...
                     ),
+                    (
                         'superuser_mapping',
                         django.contrib.postgres.fields.jsonb.JSONField(
                         JSONField(
                             blank=True,
                             default=dict,
                             editable=False,

     import lasso
     from django.conf import settings
     from django.contrib.postgres.fields import JSONField
     from django.core.exceptions import ValidationError
     from django.db import models
     try:
         from django.db.models import JSONField
     except ImportError:
         from django.contrib.postgres.fields import JSONField
     from django.urls import reverse
     from django.utils.safestring import mark_safe
     from django.utils.translation import gettext_lazy as _
+    -

Project

General

Profile

Produits Entr'ouvert » Authentic 2

0002-django.contrib.postgres-s-JSONField-is-deprecated-71.patch