accrete 0.0.91__tar.gz → 0.0.92__tar.gz

{accrete-0.0.91 → accrete-0.0.92}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: accrete
-Version: 0.0.91
+Version: 0.0.92
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2023 Benedikt Jilek

{accrete-0.0.91 → accrete-0.0.92}/accrete/annotation.py

@@ -1,4 +1,4 @@
-from django.db.models import Field
+from django.db.models import Field, Subquery, OuterRef
 from django.db.models.expressions import Func
 from django.db.models.aggregates import Aggregate
 
@@ -34,10 +34,13 @@ class AnnotationModelMixin:
 
 class AnnotationManagerMixin:
 
-    def get_annotations(self):
+    def get_annotations(self, queryset):
         if not hasattr(self.model, 'get_annotations'):
             return {}
         return {
-            annotation['name']: annotation['annotation'].function
+            annotation['name']: Subquery(
+                queryset.annotate(**{
+                    annotation['name']: annotation['annotation'].function
+                }).filter(pk=OuterRef('pk')).values(annotation['name'])[:1])
             for annotation in self.model.get_annotations()
         }

{accrete-0.0.91 → accrete-0.0.92}/accrete/managers.py

@@ -9,7 +9,7 @@ class TenantManager(models.Manager, AnnotationManagerMixin):
         queryset = super().get_queryset()
         if tenant := get_tenant():
             queryset = queryset.filter(tenant=tenant)
-        return queryset.annotate(**self.get_annotations())
+        return queryset.annotate(**self.get_annotations(queryset))
 
     def bulk_create(
             self,

{accrete-0.0.91 → accrete-0.0.92}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'hatchling.build'
 
 [project]
 name = 'accrete'
-version = '0.0.91'
+version = '0.0.92'
 authors = [
   { name='Benedikt Jilek', email='benedikt.jilek@pm.me' },
 ]