added query condition between() for integers

Author: vaind

objectbox/CHANGELOG.md

@@ -11,6 +11,7 @@ This is a 1.0 release candidate - please try it out and give us any last-minute
 * Query conditions `inside()` renamed to `oneOf()`, `notIn()` and `notInList()` renamed to `notOneOf()`.
 * Query `stream` and `findStream()` are replaced by `QueryBuilder.watch()`, i.e. `box.query(...).watch()`.
 * New Query `stream()` to stream objects all the while the query is executed in the background.
+* New Query condition `between()` for integers and IDs.
 * Store `subscribe<EntityType>()` renamed to `watch()`.
 * Store `subscribeAll()` replaced by a shared broadcast stream `entityChanges`.
 * Entities can now contain `final` fields and they're properly stored/loaded (must be constructor params).

objectbox/lib/src/native/query/query.dart

@@ -126,28 +126,31 @@ class QueryByteVectorProperty<EntityT>
 class QueryIntegerProperty<EntityT> extends QueryProperty<EntityT, int> {
   QueryIntegerProperty(ModelProperty model) : super(model);
 
-  Condition<EntityT> _op(int p, _ConditionOp cop) =>
-      _IntegerCondition<EntityT, int>(cop, this, p, 0);
+  Condition<EntityT> _op(_ConditionOp cop, int p1, [int p2 = 0]) =>
+      _IntegerCondition<EntityT, int>(cop, this, p1, p2);
 
   Condition<EntityT> _opList(List<int> list, _ConditionOp cop) =>
       _IntegerListCondition<EntityT>(cop, this, list);
 
-  Condition<EntityT> equals(int p) => _op(p, _ConditionOp.eq);
+  Condition<EntityT> equals(int p) => _op(_ConditionOp.eq, p);
 
-  Condition<EntityT> notEquals(int p) => _op(p, _ConditionOp.notEq);
+  Condition<EntityT> notEquals(int p) => _op(_ConditionOp.notEq, p);
 
-  Condition<EntityT> greaterThan(int p) => _op(p, _ConditionOp.gt);
+  Condition<EntityT> greaterThan(int p) => _op(_ConditionOp.gt, p);
 
-  Condition<EntityT> greaterOrEqual(int p) => _op(p, _ConditionOp.greaterOrEq);
+  Condition<EntityT> greaterOrEqual(int p) => _op(_ConditionOp.greaterOrEq, p);
 
-  Condition<EntityT> lessThan(int p) => _op(p, _ConditionOp.lt);
+  Condition<EntityT> lessThan(int p) => _op(_ConditionOp.lt, p);
 
-  Condition<EntityT> lessOrEqual(int p) => _op(p, _ConditionOp.lessOrEq);
+  Condition<EntityT> lessOrEqual(int p) => _op(_ConditionOp.lessOrEq, p);
 
   Condition<EntityT> operator <(int p) => lessThan(p);
 
   Condition<EntityT> operator >(int p) => greaterThan(p);
 
+  Condition<EntityT> between(int p1, int p2) =>
+      _op(_ConditionOp.between, p1, p2);
+
   Condition<EntityT> oneOf(List<int> list) => _opList(list, _ConditionOp.oneOf);
 
   Condition<EntityT> notOneOf(List<int> list) =>

objectbox/test/query_test.dart

@@ -180,6 +180,18 @@ void main() {
     [q0, qany0, qany1, qany2, qany3, qall0].forEach((q) => q.close());
   });
 
+  test('between ints', () {
+    box.putMany(<TestEntity>[
+      TestEntity(tInt: 1),
+      TestEntity(tInt: 3),
+      TestEntity(tInt: 5),
+      TestEntity(tInt: 7),
+      TestEntity(tInt: 9)
+    ]);
+
+    expect(box.query(TestEntity_.tInt.between(3, 7)).build().count(), 3);
+  });
+
   test('.count matches of `greater` and `less`', () {
     box.putMany(<TestEntity>[
       TestEntity(tLong: 1336, tString: 'mord'),