From 3e28d5d49c9153e7ecbb6ef60f2159c498f2ade3 Mon Sep 17 00:00:00 2001 From: Hugh Willson Date: Wed, 15 Nov 2017 12:59:30 -0500 Subject: [PATCH] Adjust observeChanges skip/limit ordered observe error message (#9373) * Adjust observeChanges skip/limit ordered observe error message The `Cursor.observeChanges` function throws an error when there is an attempt to use an unordered observe with skip/limit. This error can also be thrown when attempting the same thing with `Cursor.observe`. This is because `Cursor.observe` ends up calling back to `Cursor.observeChanges`. When using `Cursor.observe` however, the shared error message is a bit misleading, as `addedAt` should be used instead of `addedBefore`. This commit adjusts the shared error message to cover both `observeChanges` and `observe` scenarios. Fixes #4996. * Bump minimongo patch version --- packages/minimongo/cursor.js | 4 ++-- packages/minimongo/package.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/minimongo/cursor.js b/packages/minimongo/cursor.js index 1bfebe1c72..0d8f2aaf33 100644 --- a/packages/minimongo/cursor.js +++ b/packages/minimongo/cursor.js @@ -231,8 +231,8 @@ export default class Cursor { // XXX allow skip/limit with unordered observe if (!options._allow_unordered && !ordered && (this.skip || this.limit)) { throw new Error( - 'must use ordered observe (ie, \'addedBefore\' instead of \'added\') ' + - 'with skip or limit' + "Must use an ordered observe with skip or limit (i.e. 'addedBefore' " + + "for observeChanges or 'addedAt' for observe, instead of 'added')." ); } diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js index 37dc9b1ba6..b58621c5dd 100644 --- a/packages/minimongo/package.js +++ b/packages/minimongo/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's client-side datastore: a port of MongoDB to Javascript", - version: '1.4.1' + version: '1.4.2' }); Package.onUse(api => {