Skip to content

Commit ce36eb7

Browse files
committed
PHPLIB-438: Unify handling for write stages in aggregation pipelines
Merged from #644 https://jira.mongodb.org/browse/PHPLIB-438
2 parents a29ed4c + a2c7e20 commit ce36eb7

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

source/includes/apiargs-MongoDBCollection-method-aggregate-option.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ source:
3939
source:
4040
file: apiargs-MongoDBCollection-common-option.yaml
4141
ref: readPreference
42-
post: |
43-
This option will be ignored when using the :ref:`$out <agg-out>` stage.
4442
---
4543
source:
4644
file: apiargs-common-option.yaml
@@ -72,7 +70,8 @@ source:
7270
file: apiargs-MongoDBCollection-common-option.yaml
7371
ref: writeConcern
7472
post: |
75-
This only applies when the :ref:`$out <agg-out>` stage is specified.
73+
This only applies when a :ref:`$out <agg-out>` or :ref:`$merge <agg-merge>`
74+
stage is specified.
7675
7776
This is not supported for server versions prior to 3.4 and will result in an
7877
exception at execution time if used.

source/includes/apiargs-MongoDBDatabase-method-aggregate-option.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ source:
3333
source:
3434
file: apiargs-MongoDBDatabase-common-option.yaml
3535
ref: readPreference
36-
post: |
37-
This option will be ignored when using the :ref:`$out <agg-out>` stage.
3836
---
3937
source:
4038
file: apiargs-common-option.yaml
@@ -48,7 +46,8 @@ source:
4846
file: apiargs-MongoDBDatabase-common-option.yaml
4947
ref: writeConcern
5048
post: |
51-
This only applies when the :ref:`$out <agg-out>` stage is specified.
49+
This only applies when a :ref:`$out <agg-out>` or :ref:`$merge <agg-merge>`
50+
stage is specified.
5251
5352
This is not supported for server versions prior to 3.4 and will result in an
5453
exception at execution time if used.

source/includes/apiargs-aggregate-option.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ source:
2424
file: apiargs-MongoDBCollection-common-option.yaml
2525
ref: bypassDocumentValidation
2626
post: |
27-
This only applies when using the :ref:`$out <agg-out>` stage.
27+
This only applies when using the :ref:`$out <agg-out>` and
28+
:ref:`$out <agg-merge>` stages.
2829
2930
Document validation requires MongoDB 3.2 or later: if you are using an earlier
3031
version of MongoDB, this option will be ignored.

0 commit comments

Comments
 (0)