diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 161a1f97..e49203ef 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,7 @@ Changelog ------------------ * values in divided chart now are filtered by other criteria choices +* removed support for other JSONFields than Django's native JSONField, removed ADMIN_CHARTS_USE_JSONFIELD setting 1.3.1 (2024-04-12) ------------------ diff --git a/README.rst b/README.rst index 8894a286..0e5c9bae 100644 --- a/README.rst +++ b/README.rst @@ -210,18 +210,6 @@ You may also need to add some includes to your template admin base, see an examp demoproject/demoproject/templates/admin/base_site.html -Usage on DB that doesn't support JSONFields -------------------------------------------- - -You can add following line to your settings in order to use JSONField from `django-jsonfield` instead of native Django JSONField: - -.. code:: python - - ADMIN_CHARTS_USE_JSONFIELD = False - -This can become handy, when deploying on MySQL<5.7 (Like AWS RDS Aurora) - - ============ Running demo ============ diff --git a/admin_tools_stats/migrations/0001_initial.py b/admin_tools_stats/migrations/0001_initial.py index ce69b694..030bc75c 100644 --- a/admin_tools_stats/migrations/0001_initial.py +++ b/admin_tools_stats/migrations/0001_initial.py @@ -3,17 +3,8 @@ from __future__ import unicode_literals from django.conf import settings - - -try: - if getattr(settings, "ADMIN_CHARTS_USE_JSONFIELD", True): - from django.db.models import JSONField - else: - from jsonfield.fields import JSONField -except ImportError: - from jsonfield.fields import JSONField - from django.db import migrations, models +from django.db.models import JSONField class Migration(migrations.Migration): diff --git a/admin_tools_stats/migrations/0002_auto_20190920_1058.py b/admin_tools_stats/migrations/0002_auto_20190920_1058.py index f6f7faf5..2bb0cbbb 100644 --- a/admin_tools_stats/migrations/0002_auto_20190920_1058.py +++ b/admin_tools_stats/migrations/0002_auto_20190920_1058.py @@ -1,17 +1,8 @@ # Generated by Django 2.2.4 on 2019-09-20 02:58 from django.conf import settings - - -try: - if getattr(settings, "ADMIN_CHARTS_USE_JSONFIELD", True): - from django.db.models import JSONField - else: - from jsonfield.fields import JSONField -except ImportError: - from jsonfield.fields import JSONField - from django.db import migrations, models +from django.db.models import JSONField class Migration(migrations.Migration): diff --git a/admin_tools_stats/migrations/0003_auto_20191007_0950.py b/admin_tools_stats/migrations/0003_auto_20191007_0950.py index 6287a4de..3d4e83c6 100644 --- a/admin_tools_stats/migrations/0003_auto_20191007_0950.py +++ b/admin_tools_stats/migrations/0003_auto_20191007_0950.py @@ -1,17 +1,8 @@ # Generated by Django 2.2.6 on 2019-10-07 07:50 from django.conf import settings - - -try: - if getattr(settings, "ADMIN_CHARTS_USE_JSONFIELD", True): - from django.db.models import JSONField - else: - from jsonfield.fields import JSONField -except ImportError: - from jsonfield.fields import JSONField - from django.db import migrations, models +from django.db.models import JSONField class Migration(migrations.Migration): diff --git a/admin_tools_stats/migrations/0012_auto_20210207_0859.py b/admin_tools_stats/migrations/0012_auto_20210207_0859.py index b97774b9..263d7659 100644 --- a/admin_tools_stats/migrations/0012_auto_20210207_0859.py +++ b/admin_tools_stats/migrations/0012_auto_20210207_0859.py @@ -3,15 +3,7 @@ import multiselectfield.db.fields from django.conf import settings from django.db import migrations, models - - -try: - if getattr(settings, "ADMIN_CHARTS_USE_JSONFIELD", True): - from django.db.models import JSONField - else: - from jsonfield.fields import JSONField -except ImportError: - from jsonfield.fields import JSONField +from django.db.models import JSONField class Migration(migrations.Migration): diff --git a/admin_tools_stats/migrations/0014_auto_20211122_1511.py b/admin_tools_stats/migrations/0014_auto_20211122_1511.py index a3b654e8..0a103329 100644 --- a/admin_tools_stats/migrations/0014_auto_20211122_1511.py +++ b/admin_tools_stats/migrations/0014_auto_20211122_1511.py @@ -4,15 +4,7 @@ import multiselectfield.db.fields from django.conf import settings from django.db import migrations, models - - -try: - if getattr(settings, "ADMIN_CHARTS_USE_JSONFIELD", True): - from django.db.models import JSONField - else: - from jsonfield.fields import JSONField -except ImportError: - from jsonfield.fields import JSONField +from django.db.models import JSONField class Migration(migrations.Migration): diff --git a/admin_tools_stats/migrations/0015_auto_20211209_0822.py b/admin_tools_stats/migrations/0015_auto_20211209_0822.py index b565137e..268e61e1 100644 --- a/admin_tools_stats/migrations/0015_auto_20211209_0822.py +++ b/admin_tools_stats/migrations/0015_auto_20211209_0822.py @@ -2,15 +2,7 @@ from django.conf import settings from django.db import migrations, models - - -try: - if getattr(settings, "ADMIN_CHARTS_USE_JSONFIELD", True): - from django.db.models import JSONField - else: - from jsonfield.fields import JSONField -except ImportError: - from jsonfield.fields import JSONField +from django.db.models import JSONField class Migration(migrations.Migration): diff --git a/admin_tools_stats/models.py b/admin_tools_stats/models.py index 392836f9..1c191c2c 100644 --- a/admin_tools_stats/models.py +++ b/admin_tools_stats/models.py @@ -30,7 +30,7 @@ from django.core.exceptions import FieldError, ValidationError from django.core.validators import RegexValidator from django.db import models -from django.db.models import ExpressionWrapper, Q +from django.db.models import ExpressionWrapper, JSONField, Q from django.db.models.aggregates import Avg, Count, Max, Min, StdDev, Sum, Variance from django.db.models.fields import DateField, DateTimeField from django.db.models.functions import Trunc @@ -54,11 +54,6 @@ def get_charts_timezone(): return None -if getattr(settings, "ADMIN_CHARTS_USE_JSONFIELD", True): - from django.db.models import JSONField -else: - from jsonfield.fields import JSONField # type: ignore - logger = logging.getLogger(__name__) operation = (