xdjango-postgres-extra 2.1.2__tar.gz → 2.2.0__tar.gz

{xdjango_postgres_extra-2.1.2/xdjango_postgres_extra.egg-info → xdjango_postgres_extra-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xdjango-postgres-extra
-Version: 2.1.2
+Version: 2.2.0
 Summary: Bringing all of PostgreSQL's awesomeness to Django.
 Home-page: https://github.com/SectorLabs/django-postgres-extra
 Author: Sector Labs
@@ -10,6 +10,7 @@ Keywords: django,postgres,extra,hstore,upsert,partioning,materialized,view
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 6.0
+Classifier: Framework :: Django :: 6.1
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

xdjango_postgres_extra-2.2.0/psqlextra/_version.py

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

{xdjango_postgres_extra-2.1.2 → xdjango_postgres_extra-2.2.0}/psqlextra/backend/introspection.py

@@ -1,6 +1,8 @@
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Dict, List, Optional, Tuple
 
+import django
+
 from django.db.backends.postgresql.introspection import (  # type: ignore[import]
     DatabaseIntrospection,
 )
@@ -305,13 +307,16 @@ class PostgresIntrospection(Introspection):
         """Gets a dictionary {field_name: (field_name_other_table,
         other_table)} representing all relations in the specified table.
 
+        Django 6.1 and newer expect a third element in the value tuple
+        that describes the database-level ON DELETE behaviour.
+
         This is overriden because the query in Django does not handle
         relations between tables in different schemas properly.
         """
 
         cursor.execute(
             """
-            SELECT a1.attname, c2.relname, a2.attname
+            SELECT a1.attname, c2.relname, a2.attname, con.confdeltype
             FROM pg_constraint con
             LEFT JOIN pg_class c1 ON con.conrelid = c1.oid
             LEFT JOIN pg_class c2 ON con.confrelid = c2.oid
@@ -324,4 +329,13 @@ class PostgresIntrospection(Introspection):
         """,
             [table_name],
         )
-        return {row[0]: (row[2], row[1]) for row in cursor.fetchall()}
+
+        rows = cursor.fetchall()
+
+        if django.VERSION >= (6, 1):
+            return {
+                row[0]: (row[2], row[1], self.on_delete_types.get(row[3]))
+                for row in rows
+            }
+
+        return {row[0]: (row[2], row[1]) for row in rows}

{xdjango_postgres_extra-2.1.2 → xdjango_postgres_extra-2.2.0}/psqlextra/backend/migrations/operations/create_partitioned_model.py

@@ -74,13 +74,19 @@ class PostgresCreatePartitionedModel(CreateModel):
         result = super().reduce(*args, **kwargs)
 
         # replace CreateModel operation with PostgresCreatePartitionedModel
+        #
+        # Django >= 6.0 reduces through `copy.replace()`, which rebuilds the
+        # operation as its own class, partitioning options included. Only a
+        # plain CreateModel still has to be converted.
         if isinstance(result, list) and result:
             for i, op in enumerate(result):
-                if isinstance(op, CreateModel):
-                    _, args, kwargs = op.deconstruct()
+                if isinstance(op, CreateModel) and not isinstance(
+                    op, PostgresCreatePartitionedModel
+                ):
+                    _, op_args, op_kwargs = op.deconstruct()
                     result[i] = PostgresCreatePartitionedModel(
-                        *args,
-                        **kwargs,
+                        *op_args,
+                        **op_kwargs,
                         partitioning_options=self.partitioning_options
                     )
 

{xdjango_postgres_extra-2.1.2 → xdjango_postgres_extra-2.2.0}/psqlextra/backend/schema.py

@@ -295,8 +295,7 @@ class PostgresSchemaEditor(SchemaEditor):
                             model, [field.column], foreign_key=True
                         )
 
-                    sql = Statement(
-                        self.sql_create_fk_not_valid,
+                    fk_parts = dict(
                         table=self.quote_name(model._meta.db_table),
                         name=self.quote_name(fk_name),
                         column=self.quote_name(field.column),
@@ -307,6 +306,15 @@ class PostgresSchemaEditor(SchemaEditor):
                         deferrable=self.connection.ops.deferrable_sql(),
                     )
 
+                    # Django 6.1 added a database-level ON DELETE clause to
+                    # the foreign key statement we borrow the template from.
+                    if django.VERSION >= (6, 1):
+                        fk_parts["on_delete_db"] = self._create_on_delete_sql(  # type: ignore[attr-defined]
+                            model, field
+                        )
+
+                    sql = Statement(self.sql_create_fk_not_valid, **fk_parts)
+
                     self.execute(sql)
 
                 # It's hard to alter a field's check because it is defined

{xdjango_postgres_extra-2.1.2 → xdjango_postgres_extra-2.2.0}/setup.py

@@ -37,6 +37,7 @@ setup(
         "Environment :: Web Environment",
         "Framework :: Django",
         "Framework :: Django :: 6.0",
+        "Framework :: Django :: 6.1",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",

xdjango_postgres_extra-2.2.0/tests/test_django_61_compatibility.py

@@ -0,0 +1,79 @@
+import io
+
+import django
+import pytest
+
+from django.core.management import call_command
+from django.db import models
+
+from . import db_introspection
+from .fake_model import delete_fake_model, get_fake_model
+
+pytestmark = pytest.mark.skipif(
+    django.VERSION < (6, 1),
+    reason="Django < 6.1 does not report database level ON DELETE behaviour",
+)
+
+
+@pytest.fixture
+def fk_target():
+    model = get_fake_model({"name": models.TextField()})
+
+    yield model
+
+    delete_fake_model(model)
+
+
+@pytest.fixture
+def fk_source(fk_target):
+    model = get_fake_model(
+        {
+            "python_cascade": models.ForeignKey(
+                fk_target, on_delete=models.CASCADE, related_name="+"
+            ),
+            "db_cascade": models.ForeignKey(
+                fk_target, on_delete=models.DB_CASCADE, related_name="+"
+            ),
+        }
+    )
+
+    yield model
+
+    delete_fake_model(model)
+
+
+def test_get_relations_reports_db_on_delete(fk_target, fk_source):
+    """Django 6.1 and newer expect the values of the dict returned by
+    `get_relations` to carry the database level ON DELETE behaviour as a third
+    element."""
+
+    relations = db_introspection.get_relations(fk_source._meta.db_table)
+
+    assert relations == {
+        # a Python level on_delete leaves no ON DELETE clause behind
+        "python_cascade_id": (
+            "id",
+            fk_target._meta.db_table,
+            models.DO_NOTHING,
+        ),
+        "db_cascade_id": (
+            "id",
+            fk_target._meta.db_table,
+            models.DB_CASCADE,
+        ),
+    }
+
+
+def test_inspectdb_unpacks_relations(fk_target, fk_source):
+    """`inspectdb` is the one command that unpacks the value tuples returned by
+    `get_relations`, so it breaks loudly when their shape is wrong."""
+
+    stdout = io.StringIO()
+    call_command(
+        "inspectdb",
+        fk_target._meta.db_table,
+        fk_source._meta.db_table,
+        stdout=stdout,
+    )
+
+    assert "ForeignKey" in stdout.getvalue()

{xdjango_postgres_extra-2.1.2 → xdjango_postgres_extra-2.2.0}/tests/test_make_migrations.py

@@ -174,7 +174,12 @@ def test_make_migration_field_operations_view_models(
     last_name_field = models.TextField(null=True)
     last_name_field.contribute_to_class(model, "last_name")
 
-    migration = make_migration(model._meta.app_label, from_state=state_1)
+    # a clone, because Django >= 6.0 strips `indexes`/`constraints` out of
+    # the options of the state it detects changes against, and `state_1` is
+    # re-used as the target state further down
+    migration = make_migration(
+        model._meta.app_label, from_state=state_1.clone()
+    )
     assert len(migration.operations) == 1
     assert isinstance(migration.operations[0], operations.ApplyState)
     assert isinstance(migration.operations[0].state_operation, AddField)

{xdjango_postgres_extra-2.1.2 → xdjango_postgres_extra-2.2.0}/tests/test_schema_editor_clone_model_to_schema.py

@@ -156,6 +156,16 @@ def fake_model_fk_target_2():
 
 @pytest.fixture
 def fake_model(fake_model_fk_target_1, fake_model_fk_target_2):
+    # `check` was renamed to `condition` in Django 5.1 and dropped in 6.0
+    if django.VERSION >= (5, 1):
+        age_height_check = models.CheckConstraint(
+            condition=Q(age__gt=0, height__gt=0), name="age_height_check"
+        )
+    else:
+        age_height_check = models.CheckConstraint(
+            check=Q(age__gt=0, height__gt=0), name="age_height_check"
+        )
+
     meta_options = {
         "indexes": [
             models.Index(fields=["age", "height"]),
@@ -167,9 +177,7 @@ def fake_model(fake_model_fk_target_1, fake_model_fk_target_2):
                 fields=["first_name", "last_name"],
                 name="first_last_name_uniq",
             ),
-            models.CheckConstraint(
-                check=Q(age__gt=0, height__gt=0), name="age_height_check"
-            ),
+            age_height_check,
         ],
         "unique_together": (
             "first_name",

{xdjango_postgres_extra-2.1.2 → xdjango_postgres_extra-2.2.0/xdjango_postgres_extra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xdjango-postgres-extra
-Version: 2.1.2
+Version: 2.2.0
 Summary: Bringing all of PostgreSQL's awesomeness to Django.
 Home-page: https://github.com/SectorLabs/django-postgres-extra
 Author: Sector Labs
@@ -10,6 +10,7 @@ Keywords: django,postgres,extra,hstore,upsert,partioning,materialized,view
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 6.0
+Classifier: Framework :: Django :: 6.1
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

{xdjango_postgres_extra-2.1.2 → xdjango_postgres_extra-2.2.0}/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_61_compatibility.py
 tests/test_django_6_compatibility.py
 tests/test_hstore_autodetect.py
 tests/test_hstore_field.py

xdjango_postgres_extra-2.1.2/psqlextra/_version.py

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