Allow specifying generic options for Query find operations #2017
Conversation
This method is only referenced from Query::execute() and used internally.
|
@alcaeus: Let me know if this PR requires a changelog entry, or if that will be automatically generated when the next 2.0 tag is made. I don't believe we need to add anything to |
| * Decorate the cursor with caching, hydration, and priming behavior. | ||
| * | ||
| * Note: while this method could strictly take a MongoDB\Driver\Cursor, we | ||
| * accept Traversable for testing purposes since Cursor cannot be mocked. |
There was a problem hiding this comment.
Note: The CursorInterface being introduced in 1.6.0 (PHPC-1123) would help here, but it's likely you'll get ODM 2.0 released before that's available. I think we should consider swapping any Cursor typehints to CursorInterface for ODM 3.0, though (if you'd like to make a ticket now).
| { | ||
| $collection = $this->getMockCollection(); | ||
| $nearest = new ReadPreference('nearest'); | ||
| $secondaryPreferred = new ReadPreference('secondaryPreferred'); |
There was a problem hiding this comment.
It would have been nice to refactor both of these tests to use data providers, but ReadPreference still cannot be serialized (pending PHPC-1281 for 1.6.0) and doing so might cause problems if the test suite is run with process isolation.
There was a problem hiding this comment.
As a workaround, you could simply pass the readPreference string for now and change it once we've updated the requirements to require 1.6.0. I'll leave it up to you whether to change this.
There was a problem hiding this comment.
Ah, that's a very sensible idea. I was too hung up on passing the raw arguments to consider it :P
No need since we're only testing |
Fixes doctrine#1808 Previously, find operations were unique in that they did not inherit generic options passed to the Query::__construct() via Builder::getQuery(). This makes find consistent with other operations and also adds tests for allowing query array options to override these generic options. This also enabled users to pass driver-specific options to Collection::find() that may not be supported by the Builder API.
|
Revised to fix CS failures in https://travis-ci.org/doctrine/mongodb-odm/jobs/524008616. Will merge after the build passes. |
Summary
Previously, find operations were unique in that they did not inherit generic options passed to the
Query::__construct()viaBuilder::getQuery(). This makes find consistent with other operations and also adds tests for allowing query array options to override these generic options.This also enabled users to pass driver-specific options to
Collection::find()that may not be supported by the Builder API.