Merge branch 'master' into firestore-transactions

This commit is contained in:
Michael Diarmid
2018-03-05 00:05:37 +00:00
committed by GitHub
9 changed files with 762 additions and 248 deletions

View File

@@ -322,7 +322,12 @@ export default class Query {
// validate.isFieldPath('fieldPath', fieldPath);
// validate.isOptionalFieldOrder('directionStr', directionStr);
if (this._queryOptions.startAt || this._queryOptions.endAt) {
if (
this._queryOptions.startAt ||
this._queryOptions.startAfter ||
this._queryOptions.endAt ||
this._queryOptions.endBefore
) {
throw new Error(
'Cannot specify an orderBy() constraint after calling ' +
'startAt(), startAfter(), endBefore() or endAt().'