Skip to content

Commit 8f91c9a

Browse files
committed
add distinct param to nativeFindString and nativeFindNumber
1 parent cb21abf commit 8f91c9a

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,9 @@ private String findString(final boolean unique) {
267267
return (String) query.callInReadTx(new Callable<String>() {
268268
@Override
269269
public String call() {
270-
return query.nativeFindString(query.handle, query.cursorHandle(), property.id, unique,
271-
enableNull, nullValueString);
270+
boolean distinctCase = distinct && !noCaseIfDistinct;
271+
return query.nativeFindString(query.handle, query.cursorHandle(), property.id, unique, distinct,
272+
distinctCase, enableNull, nullValueString);
272273
}
273274
});
274275
}
@@ -285,7 +286,7 @@ private Object findNumber(final boolean unique) {
285286
return query.callInReadTx(new Callable<Object>() {
286287
@Override
287288
public Object call() {
288-
return query.nativeFindNumber(query.handle, query.cursorHandle(), property.id, unique,
289+
return query.nativeFindNumber(query.handle, query.cursorHandle(), property.id, unique, distinct,
289290
enableNull, nullValueLong, nullValueFloat, nullValueDouble);
290291
}
291292
});

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ native float[] nativeFindFloats(long handle, long cursorHandle, int propertyId,
8383
native double[] nativeFindDoubles(long handle, long cursorHandle, int propertyId, boolean distinct,
8484
boolean enableNull, double nullValue);
8585

86-
native Object nativeFindNumber(long handle, long cursorHandle, int propertyId, boolean unique, boolean enableNull,
87-
long nullValue, float nullValueFloat, double nullValueDouble);
86+
native Object nativeFindNumber(long handle, long cursorHandle, int propertyId, boolean unique, boolean distinct,
87+
boolean enableNull, long nullValue, float nullValueFloat, double nullValueDouble);
8888

89-
native String nativeFindString(long handle, long cursorHandle, int propertyId, boolean unique, boolean enableNull,
90-
String nullValue);
89+
native String nativeFindString(long handle, long cursorHandle, int propertyId, boolean unique, boolean distinct,
90+
boolean distinctCase, boolean enableNull, String nullValue);
9191

9292
native long nativeCount(long handle, long cursorHandle);
9393

0 commit comments

Comments
 (0)