plain.models 0.46.0__tar.gz → 0.46.1__tar.gz

{plain_models-0.46.0 → plain_models-0.46.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.models
-Version: 0.46.0
+Version: 0.46.1
 Summary: Model your data and store it in a database.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-File: LICENSE

{plain_models-0.46.0 → plain_models-0.46.1}/plain/models/CHANGELOG.md

@@ -1,5 +1,15 @@
 # plain-models changelog
 
+## [0.46.1](https://github.com/dropseed/plain/releases/plain-models@0.46.1) (2025-09-25)
+
+### What's changed
+
+- Fixed `prefetch_related` for reverse foreign key relationships by correctly handling related managers in the prefetch query process ([2c04e80](https://github.com/dropseed/plain/commit/2c04e80dcd))
+
+### Upgrade instructions
+
+- No changes required
+
 ## [0.46.0](https://github.com/dropseed/plain/releases/plain-models@0.46.0) (2025-09-25)
 
 ### What's changed

{plain_models-0.46.0 → plain_models-0.46.1}/plain/models/query.py

@@ -2204,7 +2204,15 @@ def prefetch_one_level(instances, prefetcher, lookup, level):
                 if leaf and lookup.queryset is not None:
                     qs = queryset._apply_rel_filters(lookup.queryset)
                 else:
-                    qs = queryset.__class__(model=queryset.model)
+                    # Check if queryset is a QuerySet or a related manager
+                    # We need a QuerySet instance to cache the prefetched values
+                    if isinstance(queryset, QuerySet):
+                        # It's already a QuerySet, create a new instance
+                        qs = queryset.__class__(model=queryset.model)
+                    else:
+                        # It's a related manager, get its QuerySet
+                        # The manager's query property returns a properly filtered QuerySet
+                        qs = queryset.query
                 qs._result_cache = vals
                 # We don't want the individual qs doing prefetch_related now,
                 # since we have merged this into the current work.

{plain_models-0.46.0 → plain_models-0.46.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plain.models"
-version = "0.46.0"
+version = "0.46.1"
 description = "Model your data and store it in a database."
 authors = [{name = "Dave Gaeddert", email = "dave.gaeddert@dropseed.dev"}]
 readme = "README.md"

{plain_models-0.46.0 → plain_models-0.46.1}/tests/test_related_descriptors.py

@@ -117,8 +117,87 @@ class TestReverseManyToOneDescriptor:
 class TestPrefetchRelated:
     """Test prefetch_related functionality"""
 
-    # Note: prefetch_related testing requires more complex setup
-    # Core functionality works as demonstrated by basic relationship access
+    def test_prefetch_related_basic(self, db):
+        """Test basic prefetch_related functionality with reverse FK"""
+        # Create test data
+        parent1 = DeleteParent.query.create(name="Parent 1")
+        parent2 = DeleteParent.query.create(name="Parent 2")
+        DeleteParent.query.create(name="Parent 3")
+
+        child1 = ChildCascade.query.create(parent=parent1)
+        child2 = ChildCascade.query.create(parent=parent1)
+        child3 = ChildCascade.query.create(parent=parent2)
+
+        # Test prefetch_related on reverse FK
+        parents = DeleteParent.query.prefetch_related("childcascade_set").all()
+
+        # Should be able to access related objects without additional queries
+        assert len(parents) == 3
+
+        # Check if prefetch cache exists
+        parent1_from_query = next(p for p in parents if p.name == "Parent 1")
+
+        # Check if _prefetched_objects_cache is set
+        assert hasattr(parent1_from_query, "_prefetched_objects_cache"), (
+            "Prefetch cache not set"
+        )
+
+        # If prefetch worked, this should come from cache
+        parent1_children = list(parent1_from_query.childcascade_set.query.all())
+        assert len(parent1_children) == 2
+        assert child1 in parent1_children
+        assert child2 in parent1_children
+
+        parent2_from_query = next(p for p in parents if p.name == "Parent 2")
+        parent2_children = list(parent2_from_query.childcascade_set.query.all())
+        assert len(parent2_children) == 1
+        assert child3 in parent2_children
+
+        parent3_from_query = next(p for p in parents if p.name == "Parent 3")
+        parent3_children = list(parent3_from_query.childcascade_set.query.all())
+        assert len(parent3_children) == 0
+
+    def test_prefetch_related_forward_fk(self, db):
+        """Test prefetch_related functionality with forward FK"""
+        # Create test data
+        parent1 = DeleteParent.query.create(name="Parent 1")
+        parent2 = DeleteParent.query.create(name="Parent 2")
+
+        child1 = ChildCascade.query.create(parent=parent1)
+        child2 = ChildCascade.query.create(parent=parent1)
+        child3 = ChildCascade.query.create(parent=parent2)
+
+        # Test prefetch_related on forward FK
+        children = ChildCascade.query.prefetch_related("parent").all()
+
+        assert len(children) == 3
+
+        # Access related parent objects through prefetched relation
+        for child in children:
+            assert child.parent is not None
+            if child in [child1, child2]:
+                assert child.parent.name == "Parent 1"
+            elif child == child3:
+                assert child.parent.name == "Parent 2"
+
+    def test_prefetch_related_empty_result(self, db):
+        """Test prefetch_related works correctly with empty results"""
+        # Create parent with no children
+        DeleteParent.query.create(name="Lonely Parent")
+
+        parents = DeleteParent.query.prefetch_related("childcascade_set").all()
+        assert len(parents) == 1
+
+        parent_children = list(parents[0].childcascade_set.query.all())
+        assert len(parent_children) == 0
+
+    def test_prefetch_related_nonexistent_relation(self, db):
+        """Test that prefetch_related raises appropriate error for nonexistent relations"""
+        # Create at least one parent so we have something to prefetch on
+        DeleteParent.query.create(name="Test Parent")
+
+        with pytest.raises((AttributeError, ValueError)):
+            list(DeleteParent.query.prefetch_related("nonexistent_relation").all())
 
 
 class TestCustomQuerySetInheritance: