Skip to content
This repository was archived by the owner on Jun 11, 2021. It is now read-only.

Commit 6ac7178

Browse files
committed
Port null/NaN validation text from iOS
1 parent 2765ba3 commit 6ac7178

File tree

3 files changed

+11
-19
lines changed

3 files changed

+11
-19
lines changed

cloud_firestore/cloud_firestore_vm/lib/src/firebase/firestore/core/filter/field_filter.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ class FieldFilter extends Filter {
2727
} else if (value == NullValue.nullValue()) {
2828
if (operator != FilterOperator.equal) {
2929
throw ArgumentError(
30-
'Invalid Query. You can only perform equality comparisons on null (via whereEqualTo()).');
30+
'Invalid Query. Null supports only equality comparisons (via whereEqualTo()).');
3131
}
3232
return FieldFilter._(path, operator, value);
3333
} else if (value == DoubleValue.nan) {
3434
if (operator != FilterOperator.equal) {
3535
throw ArgumentError(
36-
'Invalid Query. You can only perform equality comparisons on NaN (via whereEqualTo()).');
36+
'Invalid Query. NaN supports only equality comparisons (via whereEqualTo()).');
3737
}
3838
return FieldFilter._(path, operator, value);
3939
} else if (operator == FilterOperator.arrayContains) {

cloud_firestore/cloud_firestore_vm/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ dev_dependencies:
2020
moor_ffi: ^0.4.0
2121
uuid: ^2.0.4
2222

23-
latest_commit: d50472aa4021f37bc2f74755089c9c17c47297e2
23+
latest_commit: 71adf9a660a14915377f3229eb2c990a5c19e2f1

cloud_firestore/cloud_firestore_vm/test/integration/firebase/firestore/validation_test.dart

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -465,27 +465,19 @@ void main() {
465465

466466
test('queriesWithNullOrNaNFiltersOtherThanEqualityFail', () async {
467467
final CollectionReference collection = await testCollection();
468-
await expectError(
469-
() => collection.whereGreaterThan('a', null),
470-
'Invalid Query. You can only perform equality comparisons on null '
471-
'(via whereEqualTo()).');
472-
await expectError(
473-
() => collection.whereArrayContains('a', null),
474-
'Invalid Query. You can only perform equality comparisons on null '
475-
'(via whereEqualTo()).');
468+
await expectError(() => collection.whereGreaterThan('a', null),
469+
'Invalid Query. Null supports only equality comparisons (via whereEqualTo()).');
470+
await expectError(() => collection.whereArrayContains('a', null),
471+
'Invalid Query. Null supports only equality comparisons (via whereEqualTo()).');
476472
await expectError(() => collection.whereArrayContainsAny('a', null),
477473
'Invalid Query. A non-empty array is required for "array_contains_any" filters.');
478474
await expectError(() => collection.whereIn('a', null),
479475
'Invalid Query. A non-empty array is required for "in" filters.');
480476

481-
await expectError(
482-
() => collection.whereGreaterThan('a', double.nan),
483-
'Invalid Query. You can only perform equality comparisons on NaN '
484-
'(via whereEqualTo()).');
485-
await expectError(
486-
() => collection.whereArrayContains('a', double.nan),
487-
'Invalid Query. You can only perform equality comparisons on NaN '
488-
'(via whereEqualTo()).');
477+
await expectError(() => collection.whereGreaterThan('a', double.nan),
478+
'Invalid Query. NaN supports only equality comparisons (via whereEqualTo()).');
479+
await expectError(() => collection.whereArrayContains('a', double.nan),
480+
'Invalid Query. NaN supports only equality comparisons (via whereEqualTo()).');
489481
});
490482

491483
test('queriesCannotBeCreatedFromDocumentsMissingSortValues', () async {

0 commit comments

Comments
 (0)