fix(firestore): support not equals null query

invertase · Jan 27, 2023 · b93699c · b93699c
1 parent da82c10
commit b93699c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/packages/firestore/e2e/Query/where.e2e.js b/packages/firestore/e2e/Query/where.e2e.js
@@ -88,6 +88,10 @@ describe('firestore().collection().where()', function () {
  firebase.firestore().collection(COLLECTION).where('foo.bar', '==', null);
  });
 
+ it('allows null to be used with not equal operator', function () {
+ firebase.firestore().collection(COLLECTION).where('foo.bar', '!=', null);
+ });
+
  it('throws if multiple inequalities on different paths is provided', function () {
  try {
  firebase.firestore().collection(COLLECTION).where('foo.bar', '>', 123).where('bar', '>', 123);

diff --git a/packages/firestore/lib/FirestoreQuery.js b/packages/firestore/lib/FirestoreQuery.js
@@ -437,7 +437,11 @@ export default class FirestoreQuery {
  );
  }
 
- if (isNull(value) && !this._modifiers.isEqualOperator(opStr)) {
+ if (
+ isNull(value) &&
+ !this._modifiers.isEqualOperator(opStr) &&
+ !this._modifiers.isNotEqualOperator(opStr)
+ ) {
  throw new Error(
  "firebase.firestore().collection().where(_, _, *) 'value' is invalid. You can only perform equals comparisons on null",
  );

diff --git a/packages/firestore/lib/FirestoreQueryModifiers.js b/packages/firestore/lib/FirestoreQueryModifiers.js
@@ -198,6 +198,10 @@ export default class FirestoreQueryModifiers {
  return OPERATORS[operator] === 'EQUAL';
  }
 
+ isNotEqualOperator(operator) {
+ return OPERATORS[operator] === 'NOT_EQUAL';
+ }
+
  isInOperator(operator) {
  return (
  OPERATORS[operator] === 'IN' ||