From ae435a31654cfc5e2447c7dca757c1e40a45bbb9 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 12 Dec 2020 20:11:23 -0800 Subject: [PATCH 1/2] =?UTF-8?q?Removes=20sqlite=20support=20=F0=9F=98=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RIP, things have gotten too complicated for this I think --- bookwyrm/models/import_job.py | 2 +- bookwyrm/settings.py | 4 --- bookwyrm/utils/fields.py | 67 ----------------------------------- 3 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 bookwyrm/utils/fields.py diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py index 8b09216f4..bf5d5caf5 100644 --- a/bookwyrm/models/import_job.py +++ b/bookwyrm/models/import_job.py @@ -2,12 +2,12 @@ import re import dateutil.parser +from django.contrib.postgres.fields import JSONField from django.db import models from django.utils import timezone from bookwyrm import books_manager from bookwyrm.models import ReadThrough, User, Book -from bookwyrm.utils.fields import JSONField from .base_model import PrivacyLevels diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 3784158cc..c42215b40 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -99,10 +99,6 @@ BOOKWYRM_DBS = { 'HOST': env('POSTGRES_HOST', ''), 'PORT': 5432 }, - 'sqlite': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'fedireads.db') - } } DATABASES = { diff --git a/bookwyrm/utils/fields.py b/bookwyrm/utils/fields.py deleted file mode 100644 index 8978f4bcb..000000000 --- a/bookwyrm/utils/fields.py +++ /dev/null @@ -1,67 +0,0 @@ -'''Quick and dirty shim for JSONField and ArrayField compatibility on sqlite. - -For more info and original code, see: -- https://medium.com/@philamersune/using-postgresql-jsonfield-in-sqlite-95ad4ad2e5f1 -- https://gist.github.com/pvsune/2e5f9f9ae356d0bff633d896bc7d168b#file-django-sqlite-fields-py -''' - -import json - -from django.conf import settings -from django.contrib.postgres.fields import ( - JSONField as DjangoJSONField, - ArrayField as DjangoArrayField, -) -from django.db.models import Field - - -class JSONField(DjangoJSONField): - pass - - -class ArrayField(DjangoArrayField): - pass - - -if 'sqlite' in settings.DATABASES['default']['ENGINE']: - class JSONField(Field): - def db_type(self, connection): - return 'text' - - def from_db_value(self, value, expression, connection): - if value is not None: - return self.to_python(value) - return value - - def to_python(self, value): - if value is not None: - try: - return json.loads(value) - except (TypeError, ValueError): - return value - return value - - def get_prep_value(self, value): - if value is not None: - return str(json.dumps(value)) - return value - - def value_to_string(self, obj): - return self.value_from_object(obj) - - - class ArrayField(JSONField): - def __init__(self, base_field, size=None, **kwargs): - """Care for DjangoArrayField's kwargs.""" - self.base_field = base_field - self.size = size - super().__init__(**kwargs) - - def deconstruct(self): - """Need to create migrations properly.""" - name, path, args, kwargs = super().deconstruct() - kwargs.update({ - 'base_field': self.base_field.clone(), - 'size': self.size, - }) - return name, path, args, kwargs From d3371991e1d3c5775b8c217db1697b376df4e393 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 12 Dec 2020 20:18:03 -0800 Subject: [PATCH 2/2] Remove deleted util file from migrations --- bookwyrm/migrations/0001_initial.py | 6 +++--- ...221_1702_squashed_0064_merge_20201101_1913.py | 16 ++++++++-------- bookwyrm/migrations/0016_auto_20201129_0304.py | 7 +++---- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/bookwyrm/migrations/0001_initial.py b/bookwyrm/migrations/0001_initial.py index b1aba7dfb..347057e1d 100644 --- a/bookwyrm/migrations/0001_initial.py +++ b/bookwyrm/migrations/0001_initial.py @@ -7,7 +7,7 @@ import django.core.validators from django.db import migrations, models import django.db.models.deletion import django.utils.timezone -import bookwyrm.utils.fields +from django.contrib.postgres.fields import JSONField class Migration(migrations.Migration): @@ -62,7 +62,7 @@ class Migration(migrations.Migration): ('content', models.TextField(blank=True, null=True)), ('created_date', models.DateTimeField(auto_now_add=True)), ('openlibrary_key', models.CharField(max_length=255)), - ('data', bookwyrm.utils.fields.JSONField()), + ('data', JSONField()), ], options={ 'abstract': False, @@ -75,7 +75,7 @@ class Migration(migrations.Migration): ('content', models.TextField(blank=True, null=True)), ('created_date', models.DateTimeField(auto_now_add=True)), ('openlibrary_key', models.CharField(max_length=255, unique=True)), - ('data', bookwyrm.utils.fields.JSONField()), + ('data', JSONField()), ('cover', models.ImageField(blank=True, null=True, upload_to='covers/')), ('added_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), ('authors', models.ManyToManyField(to='bookwyrm.Author')), diff --git a/bookwyrm/migrations/0006_auto_20200221_1702_squashed_0064_merge_20201101_1913.py b/bookwyrm/migrations/0006_auto_20200221_1702_squashed_0064_merge_20201101_1913.py index 13cb1406a..6a149ab59 100644 --- a/bookwyrm/migrations/0006_auto_20200221_1702_squashed_0064_merge_20201101_1913.py +++ b/bookwyrm/migrations/0006_auto_20200221_1702_squashed_0064_merge_20201101_1913.py @@ -2,7 +2,6 @@ import bookwyrm.models.connector import bookwyrm.models.site -import bookwyrm.utils.fields from django.conf import settings import django.contrib.postgres.operations import django.core.validators @@ -10,6 +9,7 @@ from django.db import migrations, models import django.db.models.deletion import django.db.models.expressions import django.utils.timezone +from django.contrib.postgres.fields import JSONField, ArrayField import uuid @@ -148,7 +148,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='book', name='misc_identifiers', - field=bookwyrm.utils.fields.JSONField(null=True), + field=JSONField(null=True), ), migrations.AddField( model_name='book', @@ -226,7 +226,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='author', name='aliases', - field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), + field=bookwyrm.models.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), ), migrations.AddField( model_name='user', @@ -394,17 +394,17 @@ class Migration(migrations.Migration): migrations.AddField( model_name='book', name='subject_places', - field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), + field=ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), ), migrations.AddField( model_name='book', name='subjects', - field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), + field=ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), ), migrations.AddField( model_name='edition', name='publishers', - field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), + field=ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), ), migrations.AlterField( model_name='connector', @@ -578,7 +578,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='book', name='languages', - field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), + field=ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), ), migrations.AddField( model_name='edition', @@ -676,7 +676,7 @@ class Migration(migrations.Migration): name='ImportItem', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('data', bookwyrm.utils.fields.JSONField()), + ('data', JSONField()), ], ), migrations.CreateModel( diff --git a/bookwyrm/migrations/0016_auto_20201129_0304.py b/bookwyrm/migrations/0016_auto_20201129_0304.py index 2bf820e18..1e7159691 100644 --- a/bookwyrm/migrations/0016_auto_20201129_0304.py +++ b/bookwyrm/migrations/0016_auto_20201129_0304.py @@ -1,10 +1,9 @@ # Generated by Django 3.0.7 on 2020-11-29 03:04 -import bookwyrm.utils.fields from django.conf import settings from django.db import migrations, models import django.db.models.deletion - +from django.contrib.postgres.fields import ArrayField class Migration(migrations.Migration): @@ -16,12 +15,12 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='book', name='subject_places', - field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, null=True, size=None), + field=ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, null=True, size=None), ), migrations.AlterField( model_name='book', name='subjects', - field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, null=True, size=None), + field=ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, null=True, size=None), ), migrations.AlterField( model_name='edition',