property/condition optimization: case_sensistive is opt-in for strings #29

Author: dan-obx

objectbox/condition.py

@@ -113,8 +113,8 @@ def alias(self, value: str):
 
     def _apply_eq(self, qb: QueryBuilder) -> obx_qb_cond:
         value = self._args['value']
-        case_sensitive = self._args['case_sensitive']
         if isinstance(value, str):
+            case_sensitive = self._args['case_sensitive']
             return qb.equals_string(self._property_id, value, case_sensitive)
         elif isinstance(value, int):
             return qb.equals_int(self._property_id, value)
@@ -123,8 +123,8 @@ def _apply_eq(self, qb: QueryBuilder) -> obx_qb_cond:
 
     def _apply_not_eq(self, qb: QueryBuilder) -> obx_qb_cond:
         value = self._args['value']
-        case_sensitive = self._args['case_sensitive']
         if isinstance(value, str):
+            case_sensitive = self._args['case_sensitive']
             return qb.not_equals_string(self._property_id, value, case_sensitive)
         elif isinstance(value, int):
             return qb.not_equals_int(self._property_id, value)
@@ -149,16 +149,16 @@ def _apply_starts_with(self, qb: QueryBuilder) -> obx_qb_cond:
 
     def _apply_ends_with(self, qb: QueryBuilder) -> obx_qb_cond:
         value = self._args['value']
-        case_sensitive = self._args['case_sensitive']
         if isinstance(value, str):
+            case_sensitive = self._args['case_sensitive']
             return qb.ends_with_string(self._property_id, value, case_sensitive)
         else:
             raise Exception(f"Unsupported type for 'ENDS_WITH': {type(value)}")
 
     def _apply_gt(self, qb: QueryBuilder) -> obx_qb_cond:
         value = self._args['value']
-        case_sensitive = self._args['case_sensitive']
         if isinstance(value, str):
+            case_sensitive = self._args['case_sensitive']
             return qb.greater_than_string(self._property_id, value, case_sensitive)
         elif isinstance(value, int):
             return qb.greater_than_int(self._property_id, value)
@@ -167,8 +167,8 @@ def _apply_gt(self, qb: QueryBuilder) -> obx_qb_cond:
 
     def _apply_gte(self, qb: QueryBuilder) -> obx_qb_cond:
         value = self._args['value']
-        case_sensitive = self._args['case_sensitive']
         if isinstance(value, str):
+            case_sensitive = self._args['case_sensitive']
             return qb.greater_or_equal_string(self._property_id, value, case_sensitive)
         elif isinstance(value, int):
             return qb.greater_or_equal_int(self._property_id, value)
@@ -177,8 +177,8 @@ def _apply_gte(self, qb: QueryBuilder) -> obx_qb_cond:
 
     def _apply_lt(self, qb: QueryBuilder) -> obx_qb_cond:
         value = self._args['value']
-        case_sensitive = self._args['case_sensitive']
         if isinstance(value, str):
+            case_sensitive = self._args['case_sensitive']
             return qb.less_than_string(self._property_id, value, case_sensitive)
         elif isinstance(value, int):
             return qb.less_than_int(self._property_id, value)
@@ -187,8 +187,8 @@ def _apply_lt(self, qb: QueryBuilder) -> obx_qb_cond:
 
     def _apply_lte(self, qb: QueryBuilder) -> obx_qb_cond:
         value = self._args['value']
-        case_sensitive = self._args['case_sensitive']
         if isinstance(value, str):
+            case_sensitive = self._args['case_sensitive']
             return qb.less_or_equal_string(self._property_id, value, case_sensitive)
         elif isinstance(value, int):
             return qb.less_or_equal_int(self._property_id, value)

objectbox/model/properties.py

@@ -184,11 +184,11 @@ def _set_flags(self):
                 self._flags |= self._index.type
 
     def equals(self, value) -> PropertyQueryCondition:
-        args = {'value': value, 'case_sensitive': False}
+        args = {'value': value}
         return PropertyQueryCondition(self._id, PropertyQueryConditionOp.EQ, args)
 
     def not_equals(self, value) -> PropertyQueryCondition:
-        args = {'value': value, 'case_sensitive': False}
+        args = {'value': value}
         return PropertyQueryCondition(self._id, PropertyQueryConditionOp.NOT_EQ, args)
 
 # ID property (primary key)
@@ -249,27 +249,27 @@ def __init__(self, py_type : Type, **kwargs):
         super(_NumericProperty, self).__init__(py_type, **kwargs)
 
     def equals(self, value) -> PropertyQueryCondition:
-        args = {'value': value, 'case_sensitive': False}
+        args = {'value': value}
         return PropertyQueryCondition(self._id, PropertyQueryConditionOp.EQ, args)
 
     def not_equals(self, value) -> PropertyQueryCondition:
-        args = {'value': value, 'case_sensitive': False}
+        args = {'value': value}
         return PropertyQueryCondition(self._id, PropertyQueryConditionOp.NOT_EQ, args)
 
     def greater_than(self, value) -> PropertyQueryCondition:
-        args = {'value': value, 'case_sensitive': False}
+        args = {'value': value}
         return PropertyQueryCondition(self._id, PropertyQueryConditionOp.GT, args)
 
     def greater_or_equal(self, value) -> PropertyQueryCondition:
-        args = {'value': value, 'case_sensitive': False}
+        args = {'value': value}
         return PropertyQueryCondition(self._id, PropertyQueryConditionOp.GTE, args)
 
     def less_than(self, value) -> PropertyQueryCondition:
-        args = {'value': value, 'case_sensitive': False}
+        args = {'value': value}
         return PropertyQueryCondition(self._id, PropertyQueryConditionOp.LT, args)
 
     def less_or_equal(self, value) -> PropertyQueryCondition:
-        args = {'value': value, 'case_sensitive': False}
+        args = {'value': value}
         return PropertyQueryCondition(self._id, PropertyQueryConditionOp.LTE, args)
 
     def between(self, a, b) -> PropertyQueryCondition: