Skip to content

Commit

Permalink
remove support for other JSONFields than Django's native
Browse files Browse the repository at this point in the history
  • Loading branch information
PetrDlouhy committed Aug 2, 2024
1 parent f44bfc3 commit fda961f
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 75 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
------------------
Expand Down
12 changes: 0 additions & 12 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
============
Expand Down
11 changes: 1 addition & 10 deletions admin_tools_stats/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
11 changes: 1 addition & 10 deletions admin_tools_stats/migrations/0002_auto_20190920_1058.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
11 changes: 1 addition & 10 deletions admin_tools_stats/migrations/0003_auto_20191007_0950.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
10 changes: 1 addition & 9 deletions admin_tools_stats/migrations/0012_auto_20210207_0859.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
10 changes: 1 addition & 9 deletions admin_tools_stats/migrations/0014_auto_20211122_1511.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
10 changes: 1 addition & 9 deletions admin_tools_stats/migrations/0015_auto_20211209_0822.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
7 changes: 1 addition & 6 deletions admin_tools_stats/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 = (
Expand Down

0 comments on commit fda961f

Please sign in to comment.