respect store-default query CaseSensitive value on property queries

Author: vaind

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

@@ -209,13 +209,14 @@ class DoublePropertyQuery extends PropertyQuery<double> with _CommonNumeric {
 
 /// "Property query" for a string field. Created by [Query.property()].
 class StringPropertyQuery extends PropertyQuery<String> {
-  bool _caseSensitive = false;
+  bool _caseSensitive;
 
-  StringPropertyQuery._(Pointer<OBX_query> query, int propertyId, int obxType)
-      : super._(query, propertyId, obxType);
+  StringPropertyQuery._(
+      Store store, Pointer<OBX_query> query, int propertyId, int obxType)
+      : _caseSensitive = InternalStoreAccess.queryCS(store),
+        super._(query, propertyId, obxType);
 
-  /// Set to return case sensitive distinct values.
-  ///
+  /// Use case-sensitive comparison when querying [distinct] values.
   /// E.g. returning "foo","Foo","FOO" instead of just "foo".
   set caseSensitive(bool caseSensitive) {
     _caseSensitive = caseSensitive;
@@ -231,6 +232,15 @@ class StringPropertyQuery extends PropertyQuery<String> {
     checkObx(C.query_prop_distinct_case(_cProp, d, _caseSensitive));
   }
 
+  /// Returns the count of non-null values.
+  @override
+  int count() {
+    // native c-api currently doesn't respect case-sensitive with distinct
+    // TODO Remove once this is fixed in all platforms (c-api ^0.13.1)
+    if (_distinct && !_caseSensitive) return find().length;
+    return super.count();
+  }
+
   @override
   List<String> find({String? replaceNullWith}) {
     final cDefault = replaceNullWith == null

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

@@ -763,7 +763,8 @@ class Query<T> {
         qp._type == OBXPropertyType.Double) {
       return DoublePropertyQuery._(_cQuery, qp._propertyId, qp._type) as PQ;
     } else if (OBXPropertyType.String == qp._type) {
-      return StringPropertyQuery._(_cQuery, qp._propertyId, qp._type) as PQ;
+      return StringPropertyQuery._(_store, _cQuery, qp._propertyId, qp._type)
+          as PQ;
     } else {
       throw Exception(
           'Property query: unsupported type (OBXPropertyType: ${qp._type})');

objectbox/test/query_property_test.dart

@@ -32,7 +32,7 @@ void main() {
   final strings = [
     'string',
     'another',
-    'string',
+    'String',
     '1withSuffix',
     '2withSuffix',
     '1withSuffix',
@@ -432,32 +432,39 @@ void main() {
     final query =
         box.query(tString.contains('t', caseSensitive: false)).build();
     final queryString = query.property(tString) as StringPropertyQuery;
+
+    final allStrings = queryString.find()..sort();
+    print('All items: $allStrings');
+
+    final testStringPQ =
+        ({required bool distinct, required bool caseSensitive}) {
+      queryString
+        ..distinct = distinct
+        ..caseSensitive = caseSensitive;
+      final items = queryString.find()..sort();
+
+      final itemsDartMap =
+          allStrings.map((s) => caseSensitive ? s : s.toLowerCase());
+      final itemsDart =
+          (distinct ? itemsDartMap.toSet() : itemsDartMap).toList()..sort();
+
+      expect(items.map((s) => caseSensitive ? s : s.toLowerCase()).toList(),
+          sameAsList(itemsDart));
+      if (queryString.count()!= itemsDart.length) {
+        printOnFailure('$itemsDart');
+        expect(queryString.count(), itemsDart.length);
+      }
+    };
+
     expect(queryString.count(), 8);
-    expect((queryString..distinct = true).count(), 5);
-    expect(
-        (queryString
-              ..distinct = false
-              ..caseSensitive = false)
-            .count(),
-        8);
-    expect(
-        (queryString
-              ..distinct = false
-              ..caseSensitive = true)
-            .count(),
-        8);
-    expect(
-        (queryString
-              ..distinct = true
-              ..caseSensitive = false)
-            .count(),
-        5);
-    expect(
-        (queryString
-              ..distinct = true
-              ..caseSensitive = true)
-            .count(),
-        5);
+
+    // test without setting "caseSensitive" (implies the default TRUE)
+    expect((queryString..distinct = true).count(), 6);
+
+    testStringPQ(distinct: false, caseSensitive: false);
+    testStringPQ(distinct: false, caseSensitive: true);
+    testStringPQ(distinct: true, caseSensitive: false);
+    testStringPQ(distinct: true, caseSensitive: true);
     queryString.close();
     query.close();
   });