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
39b740ac
Unverified
Commit
39b740ac
authored
Sep 04, 2019
by
Andreas Braun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PHPLIB-473: Don't override writeConcern when in a transaction
parent
8e865691
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
Client.php
src/Client.php
+1
-1
Database.php
src/Database.php
+4
-4
No files found.
src/Client.php
View file @
39b740ac
...
...
@@ -172,7 +172,7 @@ class Client
$server
=
select_server
(
$this
->
manager
,
$options
);
if
(
!
isset
(
$options
[
'writeConcern'
])
&&
server_supports_feature
(
$server
,
self
::
$wireVersionForWritableCommandWriteConcern
))
{
if
(
!
isset
(
$options
[
'writeConcern'
])
&&
server_supports_feature
(
$server
,
self
::
$wireVersionForWritableCommandWriteConcern
)
&&
!
is_in_transaction
(
$options
)
)
{
$options
[
'writeConcern'
]
=
$this
->
writeConcern
;
}
...
...
src/Database.php
View file @
39b740ac
...
...
@@ -282,7 +282,7 @@ class Database
$server
=
select_server
(
$this
->
manager
,
$options
);
if
(
!
isset
(
$options
[
'writeConcern'
])
&&
server_supports_feature
(
$server
,
self
::
$wireVersionForWritableCommandWriteConcern
))
{
if
(
!
isset
(
$options
[
'writeConcern'
])
&&
server_supports_feature
(
$server
,
self
::
$wireVersionForWritableCommandWriteConcern
)
&&
!
is_in_transaction
(
$options
)
)
{
$options
[
'writeConcern'
]
=
$this
->
writeConcern
;
}
...
...
@@ -309,7 +309,7 @@ class Database
$server
=
select_server
(
$this
->
manager
,
$options
);
if
(
!
isset
(
$options
[
'writeConcern'
])
&&
server_supports_feature
(
$server
,
self
::
$wireVersionForWritableCommandWriteConcern
))
{
if
(
!
isset
(
$options
[
'writeConcern'
])
&&
server_supports_feature
(
$server
,
self
::
$wireVersionForWritableCommandWriteConcern
)
&&
!
is_in_transaction
(
$options
)
)
{
$options
[
'writeConcern'
]
=
$this
->
writeConcern
;
}
...
...
@@ -337,7 +337,7 @@ class Database
$server
=
select_server
(
$this
->
manager
,
$options
);
if
(
!
isset
(
$options
[
'writeConcern'
])
&&
server_supports_feature
(
$server
,
self
::
$wireVersionForWritableCommandWriteConcern
))
{
if
(
!
isset
(
$options
[
'writeConcern'
])
&&
server_supports_feature
(
$server
,
self
::
$wireVersionForWritableCommandWriteConcern
)
&&
!
is_in_transaction
(
$options
)
)
{
$options
[
'writeConcern'
]
=
$this
->
writeConcern
;
}
...
...
@@ -444,7 +444,7 @@ class Database
$server
=
select_server
(
$this
->
manager
,
$options
);
if
(
!
isset
(
$options
[
'writeConcern'
])
&&
server_supports_feature
(
$server
,
self
::
$wireVersionForWritableCommandWriteConcern
))
{
if
(
!
isset
(
$options
[
'writeConcern'
])
&&
server_supports_feature
(
$server
,
self
::
$wireVersionForWritableCommandWriteConcern
)
&&
!
is_in_transaction
(
$options
)
)
{
$options
[
'writeConcern'
]
=
$this
->
writeConcern
;
}
...
...
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