Merge branch '42-alias-combined-condition-crash' into dev

Author: greenrobot

objectbox-java/src/main/java/io/objectbox/query/QueryBuilder.java

@@ -94,7 +94,14 @@ enum Operator {
 
  private long handle;
 
+ /**
+ * Holds on to last condition. May be a property condition or a combined condition.
+ */
  private long lastCondition;
+ /**
+ * Holds on to last property condition to use with {@link #parameterAlias(String)}
+ */
+ private long lastPropertyCondition;
  private Operator combineNextWith = Operator.NONE;
 
  @Nullable
@@ -307,10 +314,10 @@ public QueryBuilder<T> sort(Comparator<T> comparator) {
  */
  public QueryBuilder<T> parameterAlias(String alias) {
  verifyHandle();
- if (lastCondition == 0) {
+ if (lastPropertyCondition == 0) {
  throw new IllegalStateException("No previous condition. Before you can assign an alias, you must first have a condition.");
  }
- nativeSetParameterAlias(lastCondition, alias);
+ nativeSetParameterAlias(lastPropertyCondition, alias);
  return this;
  }
 
@@ -478,6 +485,7 @@ private void checkCombineCondition(long currentCondition) {
  } else {
  lastCondition = currentCondition;
  }
+ lastPropertyCondition = currentCondition;
  }
 
  public QueryBuilder<T> isNull(Property<T> property) {

tests/objectbox-java-test/src/test/java/io/objectbox/query/QueryTest.java

@@ -607,6 +607,27 @@ public void testSetParameterString() {
  assertEquals(2, query.findUnique().getId());
  }
 
+ /**
+ * https://github.com/objectbox/objectbox-java/issues/834
+ */
+ @Test
+ public void parameterAlias_combinedConditions() {
+ putTestEntitiesScalars();
+
+ Query<TestEntity> query = box.query()
+ .greater(simpleInt, 0).parameterAlias("greater")
+ .or()
+ .less(simpleInt, 0).parameterAlias("less")
+ .build();
+ List<TestEntity> results = query
+ .setParameter("greater", 2008)
+ .setParameter("less", 2001)
+ .find();
+ assertEquals(2, results.size());
+ assertEquals(2000, results.get(0).getSimpleInt());
+ assertEquals(2009, results.get(1).getSimpleInt());
+ }
+
  @Test
  public void testForEach() {
  List<TestEntity> testEntities = putTestEntitiesStrings();