accrete 0.0.91__py3-none-any.whl → 0.0.92__py3-none-any.whl

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/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.dist-info → accrete-0.0.92.dist-info}/METADATA

@@ -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.dist-info → accrete-0.0.92.dist-info}/RECORD

@@ -1,10 +1,10 @@
 accrete/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/admin.py,sha256=MUYUmCFlGYPowiXTbwl4_Q6Cq0-neiL53WW4P76JCLs,1174
-accrete/annotation.py,sha256=P85kNgf_ka3U8i5cwaiKaAiSm21U-xY9PKmXMZR2ulU,1160
+accrete/annotation.py,sha256=GCpTTX3fJH9w2vOOOydKcAALdEd1gRNjh_Ws9LkJ4aA,1355
 accrete/apps.py,sha256=F7ynMLHJr_6bRujWtZVUzCliY2CGKiDvyUmL4F68L2E,146
 accrete/config.py,sha256=eJUbvyBO3DvAD6xkVKjTAzlXy7V7EK9bVyb91girfUs,299
 accrete/forms.py,sha256=2vUh80qNvPDD8Zl3agKBSJEQeY7bXVLOx_SAB34wf8E,1359
-accrete/managers.py,sha256=CaIJLeBry4NYIXaVUrdUjp7zx4sEWgv-1-ssI1m-EOs,1156
+accrete/managers.py,sha256=vODaKmWPvgfRoYXbQ_JD-pRjd2QWM_a9Gjkllrua0WE,1164
 accrete/middleware.py,sha256=IABs2pAV-kXjp3n5_Wsc7reXGjU5FhmCbvFB8cC4ZRM,3422
 accrete/models.py,sha256=xliEVR0XPW46ZDJn3-F46s54tG9dxz7BVLbkq1pC144,5434
 accrete/storage.py,sha256=z7pHdQFw0hFGrrbfqIh7KFxabQ_JGqoPebmiX9TLmeU,1254
@@ -232,7 +232,7 @@ accrete/utils/dates.py,sha256=apM6kt6JhGrKgoT0jfav1W-8AUVTxNc9xt3fJQ2n0JI,1492
 accrete/utils/forms.py,sha256=IvxbXNpSd4a-JBgsTJhs2GHe-DCRWX-xnVPRcoiCzbI,3104
 accrete/utils/http.py,sha256=sUDwa9hpYAle7d0iJxIA5wQk2mK2BMENo7JyFBSPxKc,4475
 accrete/utils/models.py,sha256=EEhv7-sQVtQD24PEb3XcDUAh3VVhVFoMMLyFrDjGEaI,706
-accrete-0.0.91.dist-info/METADATA,sha256=k3qGFn3c_K4AyeJlP31KEul9lkm9cG_fdxZBY1CIilY,4952
-accrete-0.0.91.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-accrete-0.0.91.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
-accrete-0.0.91.dist-info/RECORD,,
+accrete-0.0.92.dist-info/METADATA,sha256=qQWTwFVcTYzWGNz5a5Zl4IRkzL8oZRiLywbh4ueADSc,4952
+accrete-0.0.92.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+accrete-0.0.92.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
+accrete-0.0.92.dist-info/RECORD,,