Merge branch 'lcd1232:master' into fix-default-values

Author: obdulia-losantos

.github/workflows/test.yml

@@ -35,7 +35,14 @@ jobs:
           - "2.2"
           - "3.0"
           - "3.1"
-
+          - "3.2"
+          - "4.0"
+        exclude:
+          # django 4.0 supports python >= 3.8
+          - python-version: "3.6"
+            django-version: "4.0"
+          - python-version: "3.7"
+            django-version: "4.0"
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}

.gitignore

@@ -28,3 +28,6 @@ pip-log.txt
 
 # Sublime Codeintel
 .codeintel/
+
+# virtualenv
+venv/

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
+## 2.0.5 - 2022-10-03
+### Fixed
+- Disable psycopg2 parsing JSONField value in Django 3.1+ ([#29](https://github.com/lcd1232/django-postgrespool2/pull/29)) 
+
+## 2.0.3 - 2022-07-17
+### Fixed
+- Fixed timezone aware ([#27](https://github.com/lcd1232/django-postgrespool2/pull/27))
+
 ## 2.0.1 - 2021-02-28
 ### Added
 - Support django 2.2, 3.0 and 3.1

django_postgrespool2/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "2.0.1"
+__version__ = "2.0.5"
 __author__ = 'lcd1232'

django_postgrespool2/base.py

@@ -1,3 +1,4 @@
+import datetime
 import logging
 from functools import partial
 from importlib import import_module
@@ -10,14 +11,27 @@
 )
 from django.db.backends.postgresql.creation import DatabaseCreation as Psycopg2DatabaseCreation
 from django.dispatch import Signal
+from django.utils import version
 try:
     from django.utils.asyncio import async_unsafe
 except ImportError:
     # dummy decorator
     def async_unsafe(func):
         return func
 try:
+    # django 2.2
     from django.db.backends.postgresql.utils import utc_tzinfo_factory
+    from django.utils.timezone import utc
+
+    def utc_tzinfo_factory(offset):
+        zero = 0
+        # psycopg>=2.9 sends offset as timedelta
+        if isinstance(offset, datetime.timedelta):
+            zero = datetime.timedelta()
+        if offset != zero:
+            raise AssertionError("database connection isn't set to UTC")
+        return utc
+
 except ImportError:
     utc_tzinfo_factory = None
 from sqlalchemy import event
@@ -40,10 +54,11 @@ def async_unsafe(func):
 pool_args['poolclass'] = pool_cls
 
 db_pool = manage(Database, **pool_args)
-pool_disposed = Signal(providing_args=["connection"])
+pool_disposed = Signal()
 
 log = logging.getLogger('z.pool')
 
+django_version = version.get_version_tuple(version.get_version())
 
 def _log(message, *args):
     log.debug(message)
@@ -101,12 +116,13 @@ def create_cursor(self, name=None):
                 name, scrollable=False, withhold=self.connection.autocommit)
         else:
             cursor = self._pool_connection.cursor()
-        cursor.tzinfo_factory = utc_tzinfo_factory if settings.USE_TZ else None
+        cursor.tzinfo_factory = self.tzinfo_factory if settings.USE_TZ else None
         return cursor
 
     def tzinfo_factory(self, offset):
-        if utc_tzinfo_factory is not None:
-            return utc_tzinfo_factory
+        if utc_tzinfo_factory:
+            # for Django 2.2
+            return utc_tzinfo_factory(offset)
         return self.timezone
 
     def dispose(self):
@@ -141,6 +157,8 @@ def get_new_connection(self, conn_params):
             if self.isolation_level != c.isolation_level:
                 c.set_session(isolation_level=self.isolation_level)
 
+        if django_version >= (3, 1, 1):
+            psycopg2.extras.register_default_jsonb(conn_or_curs=c, loads=lambda x: x)
         return c
 
     def is_usable(self):

docker-compose.dev.yml

@@ -0,0 +1,9 @@
+services:
+  postgres_backend:
+    image: postgres:alpine
+    ports:
+      - 5432:5432
+    environment:
+      POSTGRES_DB: pool
+      POSTGRES_USER: pool
+      POSTGRES_PASSWORD: pool

tests/models.py

@@ -1,6 +1,14 @@
 from django.db import models
+from django.utils import timezone
+
+try:
+    from django.db.models import JSONField
+except ImportError:
+    from django.contrib.postgres.fields import JSONField
 
 
 class DogModel(models.Model):
 
     name = models.CharField(max_length=200)
+    created = models.DateTimeField(default=timezone.now)
+    attrs = JSONField(default=dict)

tests/test_django.py

@@ -1,12 +1,22 @@
-from django.test import TestCase
-from .models import DogModel
+from django.test import TestCase, override_settings
+from django.utils import timezone
+from tests.models import DogModel
 
 
 class TestPool(TestCase):
 
-    def tearUP(self):
+    def test_simple_request(self):
         DogModel.objects.create(name='wow')
         DogModel.objects.create(name='gog')
 
-    def test_simple_request(self):
-        pass
+    @override_settings(USE_TZ=True, TIME_ZONE='Asia/Hong_Kong')
+    def test_datetime_timezone(self):
+        dog = DogModel.objects.create(name="wow", created=timezone.now())
+        self.assertEqual(dog.created.tzname(), "UTC")
+        dog = DogModel.objects.get(name="wow")
+        self.assertEqual(dog.created.tzname(), "UTC")
+
+    def test_with_json(self):
+        DogModel.objects.create(name="wow", attrs={"color": "pink"})
+        dog = DogModel.objects.get(name="wow")
+        self.assertEqual(dog.attrs, {"color": "pink"})

tox.ini

@@ -27,6 +27,8 @@ deps =
     dj2.2: https://github.com/django/django/archive/stable/2.2.x.tar.gz#egg=django
     dj3.0: https://github.com/django/django/archive/stable/3.0.x.tar.gz#egg=django
     dj3.1: https://github.com/django/django/archive/stable/3.1.x.tar.gz#egg=django
+    dj3.2: https://github.com/django/django/archive/stable/3.2.x.tar.gz#egg=django
+    dj4.0: https://github.com/django/django/archive/stable/4.0.x.tar.gz#egg=django
     djmaster: https://github.com/django/django/archive/master.tar.gz#egg=django
 
 commands =