rb-commons 0.5.26__tar.gz → 0.5.28__tar.gz

{rb_commons-0.5.26 → rb_commons-0.5.28}/PKG-INFO

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

{rb_commons-0.5.26 → rb_commons-0.5.28}/rb_commons/orm/managers.py

@@ -141,7 +141,11 @@ class BaseManager(Generic[ModelType]):
         if relationship_attr:
             col = attr
             expr = self._build_comparison(col, operator, value)
-            return relationship_attr.any(expr)
+            prop = relationship_attr.property
+            if getattr(prop, "uselist", False):
+                return relationship_attr.any(expr)
+            else:
+                return relationship_attr.has(expr)
 
         col = getattr(self.model, parts[0], None) if len(parts) == 1 else attr
         return self._build_comparison(col, operator, value)
@@ -233,7 +237,10 @@ class BaseManager(Generic[ModelType]):
             self.filters.append(self._parse_lookup(k, v))
 
         for expr in expressions:
-            self.filters.append(self._q_to_expr(expr) if isinstance(expr, Q) else expr)
+            if isinstance(expr, Q) or isinstance(expr, QJSON):
+                self.filters.append(self._q_to_expr(expr))
+            else:
+                self.filters.append(expr)
 
         return self
 

{rb_commons-0.5.26 → rb_commons-0.5.28}/rb_commons.egg-info/PKG-INFO

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

{rb_commons-0.5.26 → rb_commons-0.5.28}/setup.py

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