query_condition: added and/or operator overloads #39

Author: dan-obx

objectbox/condition.py

@@ -12,9 +12,11 @@
 class QueryCondition:
     def and_(self, other: QueryCondition) -> QueryCondition:
         return LogicQueryCondition(self, other, LogicQueryConditionOp.AND)
+    __and__ = and_
 
     def or_(self, other: QueryCondition) -> QueryCondition:
         return LogicQueryCondition(self, other, LogicQueryConditionOp.OR)
+    __or__ = or_
 
     def apply(self, qb: QueryBuilder) -> obx_qb_cond:
         """ Applies the QueryCondition to the supplied QueryBuilder.

tests/test_query.py

@@ -354,6 +354,13 @@ def test_set_parameter_alias():
     query.set_parameter_alias_int("int32 condition", 40)
     assert query.find()[0].str == "FooBar"
 
+    # Test with &
+    query = box.query(
+        str_prop.equals("Foo").alias("str condition")
+        & int32_prop.greater_than(700).alias("int32 condition")
+    ).build()
+    assert query.count() == 1
+    
     # Test set parameter alias on vector
     vector_prop: Property = VectorEntity.get_property("vector_euclidean")
 
@@ -396,6 +403,17 @@ def test_set_parameter_alias_advanced():
         )
     ).build()
     assert len(query.find_ids()) == 0
+   
+    # Test using & and | ops
+    query = box.query(
+        str_prop.equals("Dummy", case_sensitive=False).alias("str_filter")
+        & bool_prop.equals(False).alias("bool_filter")
+        & (
+            int64_prop.greater_than(0).alias("int64_filter")
+            | int32_prop.less_than(100).alias("int32_filter")
+        )
+    ).build()
+    assert len(query.find_ids()) == 0
 
     # TODO currently we don't support set_parameter_* for int32/bool/other types...