Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mongo-php-library
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sinan
mongo-php-library
Commits
2decf0dc
Commit
2decf0dc
authored
Jul 03, 2019
by
Jeremy Mikola
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #631
parents
d8d95110
f3094ec7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
Watch.php
src/Operation/Watch.php
+0
-5
CollectionFunctionalTest.php
tests/Collection/CollectionFunctionalTest.php
+11
-0
No files found.
src/Operation/Watch.php
View file @
2decf0dc
...
...
@@ -213,11 +213,6 @@ class Watch implements Executable, /* @internal */ CommandSubscriber
*/
public
function
execute
(
Server
$server
)
{
$inTransaction
=
isset
(
$this
->
options
[
'session'
])
&&
$this
->
options
[
'session'
]
->
isInTransaction
();
if
(
$inTransaction
&&
isset
(
$this
->
options
[
'readConcern'
]))
{
throw
UnsupportedException
::
readConcernNotSupportedInTransaction
();
}
return
new
ChangeStream
(
$this
->
executeAggregate
(
$server
),
$this
->
resumeCallable
);
}
...
...
tests/Collection/CollectionFunctionalTest.php
View file @
2decf0dc
...
...
@@ -551,6 +551,17 @@ class CollectionFunctionalTest extends FunctionalTestCase
);
},
'w'
],
/* Disabled, as it's illegal to use change streams in transactions
[
function($collection, $session, $options = []) {
$collection->watch(
[],
['session' => $session] + $options
);
}, 'r'
],
*/
];
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment