Skip to content
This repository has been archived by the owner on Apr 4, 2023. It is now read-only.

Feature: Support queries on FieldPath #1777

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature: Support queries on FieldPath #1777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b00807b
Add iOS support for FieldPath queries
delaneyb Jan 29, 2021
0d68aaa
Add missing FieldPath.documentId()
delaneyb Jan 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/firebase.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2933,5 +2933,10 @@ export class QuerySnapshot implements firestore.QuerySnapshot {
this.docSnapshots.map(snapshot => callback(snapshot));
}
}
firebase.firestore.FieldPath = class {
static documentId() {
return com.google.firebase.firestore.FieldPath.documentId();
}
}

export * from './firebase-common';
27 changes: 17 additions & 10 deletions src/firebase.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2441,30 +2441,32 @@ firebase.firestore._getQuery = (collectionPath: string, query: FIRQuery): firest
};
};

firebase.firestore.where = (collectionPath: string, fieldPath: string, opStr: firestore.WhereFilterOp, value: any, query?: FIRQuery): firestore.Query => {
firebase.firestore.where = (collectionPath: string, fieldPath: string | FIRFieldPath, opStr: firestore.WhereFilterOp, value: any, query?: FIRQuery): firestore.Query => {
ensureFirestore();
try {
query = query || FIRFirestore.firestore().collectionWithPath(collectionPath);
value = fixSpecialField(value);

let queryFieldPathType = fieldPath instanceof FIRFieldPath ? 'FieldPath' : 'Field'

if (opStr === "<") {
query = query.queryWhereFieldIsLessThan(fieldPath, value);
query = query[`queryWhere${queryFieldPathType}IsLessThan`](fieldPath, value);
} else if (opStr === "<=") {
query = query.queryWhereFieldIsLessThanOrEqualTo(fieldPath, value);
query = query[`queryWhere${queryFieldPathType}IsLessThanOrEqualTo`](fieldPath, value);
} else if (opStr === "==") {
query = query.queryWhereFieldIsEqualTo(fieldPath, value);
query = query[`queryWhere${queryFieldPathType}IsEqualTo`](fieldPath, value);
} else if (opStr === ">=") {
query = query.queryWhereFieldIsGreaterThanOrEqualTo(fieldPath, value);
query = query[`queryWhere${queryFieldPathType}IsGreaterThanOrEqualTo`](fieldPath, value);
} else if (opStr === ">") {
query = query.queryWhereFieldIsGreaterThan(fieldPath, value);
query = query[`queryWhere${queryFieldPathType}IsGreaterThan`](fieldPath, value);
} else if (opStr === "array-contains") {
query = query.queryWhereFieldArrayContains(fieldPath, value);
query = query[`queryWhere${queryFieldPathType}ArrayContains`](fieldPath, value);
} else if (opStr === "array-contains-any") {
query = query.queryWhereFieldArrayContainsAny(fieldPath, value);
query = query[`queryWhere${queryFieldPathType}ArrayContainsAny`](fieldPath, value);
} else if (opStr === "in") {
query = query.queryWhereFieldIn(fieldPath, value);
query = query[`queryWhere${queryFieldPathType}In`](fieldPath, value);
} else {
console.log("Illegal argument for opStr: " + opStr);
console.error("Illegal argument for opStr: " + opStr);
return null;
}

Expand Down Expand Up @@ -2517,6 +2519,11 @@ firebase.firestore.endBefore = (collectionPath: string, snapshotOrFieldValue: Do
return firebase.firestore._getQuery(collectionPath, query.queryEndingBeforeValues([snapshotOrFieldValue, ...fieldValues]));
}
};
firebase.firestore.FieldPath = class {
static documentId() {
return FIRFieldPath.documentID();
}
}

@NativeClass()
class GIDSignInDelegateImpl extends NSObject implements GIDSignInDelegate {
Expand Down