rb-commons 0.7.1__tar.gz → 0.7.2__tar.gz

{rb_commons-0.7.1 → rb_commons-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.7.1
+Version: 0.7.2
 Summary: Commons of project and simplified orm based on sqlalchemy.
 Home-page: https://github.com/RoboSell-organization/rb-commons
 Author: Abdulvoris

{rb_commons-0.7.1 → rb_commons-0.7.2}/rb_commons/orm/managers.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import re
 import uuid
 from typing import TypeVar, Type, Generic, Optional, List, Dict, Literal, Union, Sequence, Any, Iterable
-from sqlalchemy import select, delete, update, and_, func, desc, inspect, or_, asc
+from sqlalchemy import select, delete, update, and_, func, desc, inspect, or_, asc, true
 from sqlalchemy.exc import IntegrityError, SQLAlchemyError
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import declarative_base, selectinload, RelationshipProperty, Load
@@ -151,9 +151,13 @@ class BaseManager(Generic[ModelType]):
     def _parse_lookup(self, lookup: str, value: Any):
         parts, operator, rel_attr, col_attr = self._parse_lookup_meta(lookup)
         expr = self._build_comparison(col_attr, operator, value)
+
         if rel_attr:
-            prop = rel_attr.property
-            return prop.uselist and rel_attr.any(expr) or rel_attr.has(expr)
+            if rel_attr.property.uselist:
+                return rel_attr.any(expr)
+            else:
+                return rel_attr.has(expr)
+
         return expr
 
     def _q_to_expr(self, q: Union[Q, QJSON]):
@@ -163,11 +167,14 @@ class BaseManager(Generic[ModelType]):
         clauses: List[Any] = [self._parse_lookup(k, v) for k, v in q.lookups.items()]
         for child in q.children:
             clauses.append(self._q_to_expr(child))
-        combined = (
-            True
-            if not clauses
-            else (or_(*clauses) if q._operator == "OR" else and_(*clauses))
-        )
+
+        if not clauses:
+            combined = true()
+        elif q._operator == "OR":
+            combined = or_(*clauses)
+        else:
+            combined = and_(*clauses)
+
         return ~combined if q.negated else combined
 
     def _parse_qjson(self, qjson: QJSON):

{rb_commons-0.7.1 → rb_commons-0.7.2}/rb_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.7.1
+Version: 0.7.2
 Summary: Commons of project and simplified orm based on sqlalchemy.
 Home-page: https://github.com/RoboSell-organization/rb-commons
 Author: Abdulvoris

{rb_commons-0.7.1 → rb_commons-0.7.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="rb-commons",
-    version="0.7.1",
+    version="0.7.2",
     author="Abdulvoris",
     author_email="erkinovabdulvoris101@gmail.com",
     description="Commons of project and simplified orm based on sqlalchemy.",