xdjango-postgres-extra 2.1.0__tar.gz → 2.1.1__tar.gz

{xdjango_postgres_extra-2.1.0 → xdjango_postgres_extra-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xdjango-postgres-extra
-Version: 2.1.0
+Version: 2.1.1
 Summary: Bringing all of PostgreSQL's awesomeness to Django.
 Home-page: https://github.com/SectorLabs/django-postgres-extra
 Author: Sector Labs
@@ -9,6 +9,7 @@ License: MIT License
 Keywords: django,postgres,extra,hstore,upsert,partioning,materialized,view
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
+Classifier: Framework :: Django :: 6.0
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -19,12 +20,15 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: Django<=6.0.4,>=2.0
+Requires-Dist: Django<7.0,>=2.0
 Requires-Dist: python-dateutil<=3.0.0,>=2.8.0
 Requires-Dist: dataclasses; python_version <= "3.6"
 Provides-Extra: dev
@@ -75,8 +79,8 @@ Requires-Dist: sphinx-rtd-theme==3.0.2; extra == "docs"
 Requires-Dist: docutils==0.21.2; extra == "docs"
 Requires-Dist: Jinja2==3.1.6; extra == "docs"
 Provides-Extra: publish
-Requires-Dist: build==0.7.0; extra == "publish"
-Requires-Dist: twine==3.7.1; extra == "publish"
+Requires-Dist: build<2.0.0,>=1.2.0; extra == "publish"
+Requires-Dist: twine<7.0.0,>=6.0.0; extra == "publish"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -96,10 +100,10 @@ Dynamic: summary
 |--------------------|---------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | :white_check_mark: | **Tests** | [![CircleCI](https://circleci.com/gh/SectorLabs/django-postgres-extra/tree/master.svg?style=svg)](https://circleci.com/gh/SectorLabs/django-postgres-extra/tree/master)                         |
 | :memo: | **License** | [![License](https://img.shields.io/:license-mit-blue.svg)](http://doge.mit-license.org)                                                                                                         |
-| :package: | **PyPi** | [![PyPi](https://badge.fury.io/py/django-postgres-extra.svg)](https://pypi.python.org/pypi/django-postgres-extra)                                                                               |
+| :package: | **PyPi** | [![PyPi](https://badge.fury.io/py/xdjango-postgres-extra.svg)](https://pypi.org/project/xdjango-postgres-extra/)                                                                                 |
 | :four_leaf_clover: | **Code coverage** | [![Coverage Status](https://coveralls.io/repos/github/SectorLabs/django-postgres-extra/badge.svg?branch=coveralls)](https://coveralls.io/github/SectorLabs/django-postgres-extra?branch=master) |
-| <img src="https://cdn.iconscout.com/icon/free/png-256/django-1-282754.png" width="22px" height="22px" align="center" /> | **Django Versions** | 2.0, 2.1, 2.2, 3.0, 3.1, 3.2, 4.0, 4.1, 4.2, 5.0, 5.1, 5.2, 6.0.4                                                                                                                               |
-| <img src="https://cdn3.iconfinder.com/data/icons/logos-and-brands-adobe/512/267_Python-512.png" width="22px" height="22px" align="center" /> | **Python Versions** | 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13                                                                                                                                                      |
+| <img src="https://cdn.iconscout.com/icon/free/png-256/django-1-282754.png" width="22px" height="22px" align="center" /> | **Django Versions** | 2.0 through 6.x                                                                                                                                                                                  |
+| <img src="https://cdn3.iconfinder.com/data/icons/logos-and-brands-adobe/512/267_Python-512.png" width="22px" height="22px" align="center" /> | **Python Versions** | 3.6 through 3.14                                                                                                                                                                                 |
 | <img src="https://pbs.twimg.com/profile_images/1152122059/psycopg-100_400x400.png" width="22px" height="22px" align="center" /> | **Psycopg Versions** | 2, 3                                                                                                                                                                                            |
 | :book: | **Documentation** | [Read The Docs](https://django-postgres-extra.readthedocs.io/en/master/)                                                                                                                        |
 | :warning: | **Upgrade** | [Upgrade from v1.x](https://django-postgres-extra.readthedocs.io/en/master/major_releases.html#new-features)                                                                                    

{xdjango_postgres_extra-2.1.0 → xdjango_postgres_extra-2.1.1}/README.md

@@ -6,10 +6,10 @@
 |--------------------|---------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | :white_check_mark: | **Tests** | [![CircleCI](https://circleci.com/gh/SectorLabs/django-postgres-extra/tree/master.svg?style=svg)](https://circleci.com/gh/SectorLabs/django-postgres-extra/tree/master)                         |
 | :memo: | **License** | [![License](https://img.shields.io/:license-mit-blue.svg)](http://doge.mit-license.org)                                                                                                         |
-| :package: | **PyPi** | [![PyPi](https://badge.fury.io/py/django-postgres-extra.svg)](https://pypi.python.org/pypi/django-postgres-extra)                                                                               |
+| :package: | **PyPi** | [![PyPi](https://badge.fury.io/py/xdjango-postgres-extra.svg)](https://pypi.org/project/xdjango-postgres-extra/)                                                                                 |
 | :four_leaf_clover: | **Code coverage** | [![Coverage Status](https://coveralls.io/repos/github/SectorLabs/django-postgres-extra/badge.svg?branch=coveralls)](https://coveralls.io/github/SectorLabs/django-postgres-extra?branch=master) |
-| <img src="https://cdn.iconscout.com/icon/free/png-256/django-1-282754.png" width="22px" height="22px" align="center" /> | **Django Versions** | 2.0, 2.1, 2.2, 3.0, 3.1, 3.2, 4.0, 4.1, 4.2, 5.0, 5.1, 5.2, 6.0.4                                                                                                                               |
-| <img src="https://cdn3.iconfinder.com/data/icons/logos-and-brands-adobe/512/267_Python-512.png" width="22px" height="22px" align="center" /> | **Python Versions** | 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13                                                                                                                                                      |
+| <img src="https://cdn.iconscout.com/icon/free/png-256/django-1-282754.png" width="22px" height="22px" align="center" /> | **Django Versions** | 2.0 through 6.x                                                                                                                                                                                  |
+| <img src="https://cdn3.iconfinder.com/data/icons/logos-and-brands-adobe/512/267_Python-512.png" width="22px" height="22px" align="center" /> | **Python Versions** | 3.6 through 3.14                                                                                                                                                                                 |
 | <img src="https://pbs.twimg.com/profile_images/1152122059/psycopg-100_400x400.png" width="22px" height="22px" align="center" /> | **Psycopg Versions** | 2, 3                                                                                                                                                                                            |
 | :book: | **Documentation** | [Read The Docs](https://django-postgres-extra.readthedocs.io/en/master/)                                                                                                                        |
 | :warning: | **Upgrade** | [Upgrade from v1.x](https://django-postgres-extra.readthedocs.io/en/master/major_releases.html#new-features)                                                                                    

xdjango_postgres_extra-2.1.1/psqlextra/_version.py

@@ -0,0 +1 @@
+__version__ = "2.1.1"

{xdjango_postgres_extra-2.1.0 → xdjango_postgres_extra-2.1.1}/setup.py

@@ -36,6 +36,7 @@ setup(
     classifiers=[
         "Environment :: Web Environment",
         "Framework :: Django",
+        "Framework :: Django :: 6.0",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
@@ -46,12 +47,15 @@ setup(
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
     ],
     python_requires=">=3.6",
     install_requires=[
-        "Django>=2.0,<=6.0.4",
+        "Django>=2.0,<7.0",
         "python-dateutil>=2.8.0,<=3.0.0",
     ],
     extras_require={
@@ -109,8 +113,8 @@ setup(
             "Jinja2==3.1.6",
         ],
         "publish": [
-            "build==0.7.0",
-            "twine==3.7.1",
+            "build>=1.2.0,<2.0.0",
+            "twine>=6.0.0,<7.0.0",
         ],
     },
 )

xdjango_postgres_extra-2.1.1/tests/test_django_6_compatibility.py

@@ -0,0 +1,33 @@
+from psqlextra.expressions import HStoreValue
+from psqlextra.lookups import InValuesLookupMixin
+
+
+class CompilableValue:
+    def as_sql(self, compiler, connection):
+        return "UPPER(%s)", ("value",)
+
+
+class InValuesLookup(InValuesLookupMixin):
+    def rhs_is_direct_value(self):
+        return True
+
+    def process_lhs(self, compiler, connection):
+        return '"field"', ("lhs",)
+
+    def process_rhs(self, compiler, connection):
+        return "%s, %s", ("one", "two")
+
+
+def test_hstore_value_returns_tuple_params():
+    _, params = HStoreValue(
+        {"expression": CompilableValue(), "plain": "value", "null": None}
+    ).as_sql(None, None)
+
+    assert params == ("expression", "value", "plain", "value", "null")
+
+
+def test_invalues_lookup_returns_tuple_params():
+    sql, params = InValuesLookup().as_sql(None, None)
+
+    assert sql == '"field" IN (VALUES (%s),(%s))'
+    assert params == ("lhs", "one", "two")

{xdjango_postgres_extra-2.1.0 → xdjango_postgres_extra-2.1.1}/xdjango_postgres_extra.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xdjango-postgres-extra
-Version: 2.1.0
+Version: 2.1.1
 Summary: Bringing all of PostgreSQL's awesomeness to Django.
 Home-page: https://github.com/SectorLabs/django-postgres-extra
 Author: Sector Labs
@@ -9,6 +9,7 @@ License: MIT License
 Keywords: django,postgres,extra,hstore,upsert,partioning,materialized,view
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
+Classifier: Framework :: Django :: 6.0
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -19,12 +20,15 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: Django<=6.0.4,>=2.0
+Requires-Dist: Django<7.0,>=2.0
 Requires-Dist: python-dateutil<=3.0.0,>=2.8.0
 Requires-Dist: dataclasses; python_version <= "3.6"
 Provides-Extra: dev
@@ -75,8 +79,8 @@ Requires-Dist: sphinx-rtd-theme==3.0.2; extra == "docs"
 Requires-Dist: docutils==0.21.2; extra == "docs"
 Requires-Dist: Jinja2==3.1.6; extra == "docs"
 Provides-Extra: publish
-Requires-Dist: build==0.7.0; extra == "publish"
-Requires-Dist: twine==3.7.1; extra == "publish"
+Requires-Dist: build<2.0.0,>=1.2.0; extra == "publish"
+Requires-Dist: twine<7.0.0,>=6.0.0; extra == "publish"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -96,10 +100,10 @@ Dynamic: summary
 |--------------------|---------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | :white_check_mark: | **Tests** | [![CircleCI](https://circleci.com/gh/SectorLabs/django-postgres-extra/tree/master.svg?style=svg)](https://circleci.com/gh/SectorLabs/django-postgres-extra/tree/master)                         |
 | :memo: | **License** | [![License](https://img.shields.io/:license-mit-blue.svg)](http://doge.mit-license.org)                                                                                                         |
-| :package: | **PyPi** | [![PyPi](https://badge.fury.io/py/django-postgres-extra.svg)](https://pypi.python.org/pypi/django-postgres-extra)                                                                               |
+| :package: | **PyPi** | [![PyPi](https://badge.fury.io/py/xdjango-postgres-extra.svg)](https://pypi.org/project/xdjango-postgres-extra/)                                                                                 |
 | :four_leaf_clover: | **Code coverage** | [![Coverage Status](https://coveralls.io/repos/github/SectorLabs/django-postgres-extra/badge.svg?branch=coveralls)](https://coveralls.io/github/SectorLabs/django-postgres-extra?branch=master) |
-| <img src="https://cdn.iconscout.com/icon/free/png-256/django-1-282754.png" width="22px" height="22px" align="center" /> | **Django Versions** | 2.0, 2.1, 2.2, 3.0, 3.1, 3.2, 4.0, 4.1, 4.2, 5.0, 5.1, 5.2, 6.0.4                                                                                                                               |
-| <img src="https://cdn3.iconfinder.com/data/icons/logos-and-brands-adobe/512/267_Python-512.png" width="22px" height="22px" align="center" /> | **Python Versions** | 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13                                                                                                                                                      |
+| <img src="https://cdn.iconscout.com/icon/free/png-256/django-1-282754.png" width="22px" height="22px" align="center" /> | **Django Versions** | 2.0 through 6.x                                                                                                                                                                                  |
+| <img src="https://cdn3.iconfinder.com/data/icons/logos-and-brands-adobe/512/267_Python-512.png" width="22px" height="22px" align="center" /> | **Python Versions** | 3.6 through 3.14                                                                                                                                                                                 |
 | <img src="https://pbs.twimg.com/profile_images/1152122059/psycopg-100_400x400.png" width="22px" height="22px" align="center" /> | **Psycopg Versions** | 2, 3                                                                                                                                                                                            |
 | :book: | **Documentation** | [Read The Docs](https://django-postgres-extra.readthedocs.io/en/master/)                                                                                                                        |
 | :warning: | **Upgrade** | [Upgrade from v1.x](https://django-postgres-extra.readthedocs.io/en/master/major_releases.html#new-features)                                                                                    

{xdjango_postgres_extra-2.1.0 → xdjango_postgres_extra-2.1.1}/xdjango_postgres_extra.egg-info/SOURCES.txt

@@ -100,6 +100,7 @@ tests/test_append_caller_to_sql.py
 tests/test_case_insensitive_unique_index.py
 tests/test_conditional_unique_index.py
 tests/test_db_backend.py
+tests/test_django_6_compatibility.py
 tests/test_hstore_autodetect.py
 tests/test_hstore_field.py
 tests/test_hstore_required.py
@@ -134,12 +135,6 @@ tests/test_settings.py
 tests/test_unique_index.py
 tests/test_upsert.py
 tests/test_view_models.py
-tests/benchmarks/__init__.py
-tests/benchmarks/test_insert_nothing.py
-tests/benchmarks/test_upsert.py
-tests/benchmarks/test_upsert_bulk.py
-tests/psqlextra_test_backend/__init__.py
-tests/psqlextra_test_backend/base.py
 xdjango_postgres_extra.egg-info/PKG-INFO
 xdjango_postgres_extra.egg-info/SOURCES.txt
 xdjango_postgres_extra.egg-info/dependency_links.txt

{xdjango_postgres_extra-2.1.0 → xdjango_postgres_extra-2.1.1}/xdjango_postgres_extra.egg-info/requires.txt

@@ -1,4 +1,4 @@
-Django<=6.0.4,>=2.0
+Django<7.0,>=2.0
 python-dateutil<=3.0.0,>=2.8.0
 
 [:python_version <= "3.6"]
@@ -38,8 +38,8 @@ docutils==0.21.2
 Jinja2==3.1.6
 
 [publish]
-build==0.7.0
-twine==3.7.1
+build<2.0.0,>=1.2.0
+twine<7.0.0,>=6.0.0
 
 [test]
 

{xdjango_postgres_extra-2.1.0 → xdjango_postgres_extra-2.1.1}/xdjango_postgres_extra.egg-info/top_level.txt

@@ -1,2 +1 @@
 psqlextra
-tests

xdjango_postgres_extra-2.1.0/psqlextra/_version.py

@@ -1 +0,0 @@
-__version__ = "2.1.0"

xdjango_postgres_extra-2.1.0/tests/benchmarks/test_insert_nothing.py

@@ -1,51 +0,0 @@
-import uuid
-
-import pytest
-
-from django.db import models, transaction
-from django.db.utils import IntegrityError
-
-from psqlextra.query import ConflictAction
-
-from ..fake_model import get_fake_model
-
-
-@pytest.mark.benchmark()
-def test_insert_nothing_traditional(benchmark):
-    model = get_fake_model(
-        {"field": models.CharField(max_length=255, unique=True)}
-    )
-
-    random_value = str(uuid.uuid4())[:8]
-    model.objects.create(field=random_value)
-
-    def _traditional_insert(model, random_value):
-        """Performs a concurrency safe insert the traditional way."""
-
-        try:
-            with transaction.atomic():
-                return model.objects.create(field=random_value)
-        except IntegrityError:
-            return model.objects.filter(field=random_value).first()
-
-    benchmark(_traditional_insert, model, random_value)
-
-
-@pytest.mark.benchmark()
-def test_insert_nothing_native(benchmark):
-    model = get_fake_model(
-        {"field": models.CharField(max_length=255, unique=True)}
-    )
-
-    random_value = str(uuid.uuid4())[:8]
-    model.objects.create(field=random_value)
-
-    def _native_insert(model, random_value):
-        """Performs a concurrency safeinsert using the native PostgreSQL
-        conflict resolution."""
-
-        return model.objects.on_conflict(
-            ["field"], ConflictAction.NOTHING
-        ).insert_and_get(field=random_value)
-
-    benchmark(_native_insert, model, random_value)

xdjango_postgres_extra-2.1.0/tests/benchmarks/test_upsert.py

@@ -1,51 +0,0 @@
-import uuid
-
-import pytest
-
-from django.db import models, transaction
-from django.db.utils import IntegrityError
-
-from ..fake_model import get_fake_model
-
-
-@pytest.mark.benchmark()
-def test_upsert_traditional(benchmark):
-    model = get_fake_model(
-        {"field": models.CharField(max_length=255, unique=True)}
-    )
-
-    random_value = str(uuid.uuid4())[:8]
-    model.objects.create(field=random_value)
-
-    def _traditional_upsert(model, random_value):
-        """Performs a concurrency safe upsert the traditional way."""
-
-        try:
-
-            with transaction.atomic():
-                return model.objects.create(field=random_value)
-        except IntegrityError:
-            model.objects.update(field=random_value)
-            return model.objects.get(field=random_value)
-
-    benchmark(_traditional_upsert, model, random_value)
-
-
-@pytest.mark.benchmark()
-def test_upsert_native(benchmark):
-    model = get_fake_model(
-        {"field": models.CharField(max_length=255, unique=True)}
-    )
-
-    random_value = str(uuid.uuid4())[:8]
-    model.objects.create(field=random_value)
-
-    def _native_upsert(model, random_value):
-        """Performs a concurrency safe upsert using the native PostgreSQL
-        upsert."""
-
-        return model.objects.upsert_and_get(
-            conflict_target=["field"], fields=dict(field=random_value)
-        )
-
-    benchmark(_native_upsert, model, random_value)

xdjango_postgres_extra-2.1.0/tests/benchmarks/test_upsert_bulk.py

@@ -1,68 +0,0 @@
-import uuid
-
-import pytest
-
-from django.db import models
-
-from psqlextra.query import ConflictAction
-
-from ..fake_model import get_fake_model
-
-ROW_COUNT = 10000
-
-
-@pytest.mark.benchmark()
-def test_upsert_bulk_naive(benchmark):
-    model = get_fake_model(
-        {"field": models.CharField(max_length=255, unique=True)}
-    )
-
-    rows = []
-    random_values = []
-    for i in range(0, ROW_COUNT):
-        random_value = str(uuid.uuid4())
-        random_values.append(random_value)
-        rows.append(model(field=random_value))
-
-    model.objects.bulk_create(rows)
-
-    def _native_upsert(model, random_values):
-        """Performs a concurrency safe upsert using the native PostgreSQL
-        upsert."""
-
-        rows = [dict(field=random_value) for random_value in random_values]
-
-        for row in rows:
-            model.objects.on_conflict(["field"], ConflictAction.UPDATE).insert(
-                **row
-            )
-
-    benchmark(_native_upsert, model, random_values)
-
-
-@pytest.mark.benchmark()
-def test_upsert_bulk_native(benchmark):
-    model = get_fake_model(
-        {"field": models.CharField(max_length=255, unique=True)}
-    )
-
-    rows = []
-    random_values = []
-    for i in range(0, ROW_COUNT):
-        random_value = str(uuid.uuid4())
-        random_values.append(random_value)
-        rows.append(model(field=random_value))
-
-    model.objects.bulk_create(rows)
-
-    def _native_upsert(model, random_values):
-        """Performs a concurrency safe upsert using the native PostgreSQL
-        upsert."""
-
-        rows = [dict(field=random_value) for random_value in random_values]
-
-        model.objects.on_conflict(["field"], ConflictAction.UPDATE).bulk_insert(
-            rows
-        )
-
-    benchmark(_native_upsert, model, random_values)

xdjango_postgres_extra-2.1.0/tests/psqlextra_test_backend/base.py

@@ -1,23 +0,0 @@
-from datetime import timezone
-
-import django
-
-from django.conf import settings
-
-from psqlextra.backend.base import DatabaseWrapper as PSQLExtraDatabaseWrapper
-
-
-class DatabaseWrapper(PSQLExtraDatabaseWrapper):
-    # Works around the compatibility issue of Django <3.0 and psycopg2.9
-    # in combination with USE_TZ
-    #
-    # See: https://github.com/psycopg/psycopg2/issues/1293#issuecomment-862835147
-    if django.VERSION < (3, 1):
-
-        def create_cursor(self, name=None):
-            cursor = super().create_cursor(name)
-            cursor.tzinfo_factory = (
-                lambda offset: timezone.utc if settings.USE_TZ else None
-            )
-
-            return cursor