maleo-foundation 0.2.55__py3-none-any.whl → 0.2.56__py3-none-any.whl

maleo_foundation/utils/query.py

@@ -1,6 +1,6 @@
 from sqlalchemy import Column, Table
 from sqlalchemy.ext.declarative import DeclarativeMeta
-from sqlalchemy.orm import Query, Session
+from sqlalchemy.orm import Query, Session, aliased
 from sqlalchemy.orm.attributes import InstrumentedAttribute
 from sqlalchemy.sql.expression import or_, asc, cast, desc
 from sqlalchemy.types import DATE, String, TEXT, TIMESTAMP
@@ -124,7 +124,9 @@ class BaseQueryUtils:
         if parent_attr is None or not isinstance(parent_attr, InstrumentedAttribute):
             return query
         if is_parent is not None:
-            subq = session.query(table).filter(parent_attr == id_attr).correlate(table).exists()
+            child_table = aliased(table)
+            child_parent_attr = getattr(child_table, parent_column)
+            subq = session.query(child_table).filter(child_parent_attr == id_attr).exists()
             query = query.filter(subq if is_parent else ~subq)
         return query
 
@@ -158,7 +160,9 @@ class BaseQueryUtils:
         if parent_attr is None or not isinstance(parent_attr, InstrumentedAttribute):
             return query
         if is_leaf is not None:
-            subq = session.query(table).filter(parent_attr == id_attr).correlate(table).exists()
+            child_table = aliased(table)
+            child_parent_attr = getattr(child_table, parent_column)
+            subq = session.query(child_table).filter(child_parent_attr == id_attr).exists()
             query = query.filter(~subq if is_leaf else subq)
         return query
 

{maleo_foundation-0.2.55.dist-info → maleo_foundation-0.2.56.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.2.55
+Version: 0.2.56
 Summary: Foundation package for Maleo
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT

{maleo_foundation-0.2.55.dist-info → maleo_foundation-0.2.56.dist-info}/RECORD

@@ -104,7 +104,7 @@ maleo_foundation/utils/exceptions.py,sha256=kDLTWiUauvc-fSKrEyxlGvIi2NtZIAhJ9bV3
 maleo_foundation/utils/extractor.py,sha256=SZXVYDHWGaA-Dd1BUydwF2HHdZqexEielS4CjL0Ceng,814
 maleo_foundation/utils/logging.py,sha256=W5Fhk_xAXVqSujaY8mv3hRH4wlQSpUn4ReuMoiKcQa4,7759
 maleo_foundation/utils/mergers.py,sha256=DniUu3Ot4qkYH_YSw4uD1cn9cfirum4S_Opp8fMkQwA,702
-maleo_foundation/utils/query.py,sha256=I-kPDbzVdHptBIdsefIb7ec4QkBnWWNKuTFBMkg9DYI,7740
+maleo_foundation/utils/query.py,sha256=nDj-9Q-5eAOvqXqKgKjtHaFAxVAY87E0BMaVXmTN7jA,7957
 maleo_foundation/utils/repository.py,sha256=knBi3xOLlhBIEtChvqbZh4wXmgrFCB3rDwQXy41d7_c,2852
 maleo_foundation/utils/dependencies/__init__.py,sha256=0KKGrdfj8Cc5A4SRk_ZBAxzOP795Mizdb4zIBh07KC4,122
 maleo_foundation/utils/dependencies/auth.py,sha256=wS9qnmd1n2WsFhiSfyq_3Io3wwZKTENVPv4rMwxJslE,727
@@ -117,7 +117,7 @@ maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg
 maleo_foundation/utils/loaders/credential/google.py,sha256=SKsqPuFnAiCcYLf24CxKnMybhVHpgqnq1gGSlThqjts,994
 maleo_foundation/utils/loaders/key/__init__.py,sha256=hVygcC2ImHc_aVrSrOmyedR8tMUZokWUKCKOSh5ctbo,106
 maleo_foundation/utils/loaders/key/rsa.py,sha256=gDhyX6iTFtHiluuhFCozaZ3pOLKU2Y9TlrNMK_GVyGU,3796
-maleo_foundation-0.2.55.dist-info/METADATA,sha256=i8k-mH5YkUoM1CVcZFQZbCaRMnsfCCqNsdPFw_nBZ5I,3598
-maleo_foundation-0.2.55.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-maleo_foundation-0.2.55.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.2.55.dist-info/RECORD,,
+maleo_foundation-0.2.56.dist-info/METADATA,sha256=shtv4asKRzyRFxs4n9_0tOhpQrtKWRx-wEobMeHCTnU,3598
+maleo_foundation-0.2.56.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+maleo_foundation-0.2.56.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.2.56.dist-info/RECORD,,