Fix implementation of Query to Pipeline for isNan, isNotNan, isNull, and isNotNull changes in the backend

Author: MarkDuckworth

packages/firestore/src/core/pipeline-util.ts

@@ -56,15 +56,15 @@ export function toPipelineBooleanExpr(f: FilterInternal): BooleanExpression {
     const fieldValue = field(f.field.toString());
     if (isNanValue(f.value)) {
       if (f.op === Operator.EQUAL) {
-        return and(fieldValue.exists(), fieldValue.isNan());
+        return and(fieldValue.exists(), fieldValue.equal(constant(NaN)));
       } else {
-        return and(fieldValue.exists(), fieldValue.isNotNan());
+        return and(fieldValue.exists(), fieldValue.notEqual(constant(NaN)));
       }
     } else if (isNullValue(f.value)) {
       if (f.op === Operator.EQUAL) {
-        return and(fieldValue.exists(), fieldValue.isNull());
+        return and(fieldValue.exists(), fieldValue.equal(constant(null)));
       } else {
-        return and(fieldValue.exists(), fieldValue.isNotNull());
+        return and(fieldValue.exists(), fieldValue.notEqual(constant(null)));
       }
     } else {
       // Comparison filters

packages/firestore/test/integration/api/query_to_pipeline.test.ts

@@ -648,7 +648,7 @@ const testUnsupportedFeatures: boolean | 'only' = false;
       async (collRef, db) => {
         const query1 = query(collRef, where('bar', '!=', NaN));
         const snapshot = await execute(db.pipeline().createFrom(query1));
-        verifyResults(snapshot, { foo: 2, bar: 1 });
+        verifyResults(snapshot, { foo: 2, bar: 1 }, { foo: 3, bar: 'bar' });
       }
     );
   });
@@ -662,8 +662,10 @@ const testUnsupportedFeatures: boolean | 'only' = false;
       },
       async (collRef, db) => {
         const query1 = query(collRef, where('bar', '==', null));
+        const classicSnapshot = await getDocs(query1);
+        const classicData = classicSnapshot.docs.map(d => d.data());
         const snapshot = await execute(db.pipeline().createFrom(query1));
-        verifyResults(snapshot, { foo: 1, bar: null });
+        verifyResults(snapshot, ...classicData);
       }
     );
   });
@@ -677,8 +679,10 @@ const testUnsupportedFeatures: boolean | 'only' = false;
       },
       async (collRef, db) => {
         const query1 = query(collRef, where('bar', '!=', null));
+        const classicSnapshot = await getDocs(query1);
+        const classicData = classicSnapshot.docs.map(d => d.data());
         const snapshot = await execute(db.pipeline().createFrom(query1));
-        verifyResults(snapshot, { foo: 2, bar: 1 });
+        verifyResults(snapshot, ...classicData);
       }
     );
   });