QueryBuilder: Hold on to last property condition to use for parameter alias.

Author: greenrobot-team

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) {