mongo 2.12.4 → 2.13.0.beta1

data/spec/spec_tests/data/change_streams/change-streams.yml

@@ -161,7 +161,7 @@ tests:
               -
                 $match:
                   "fullDocument.z":
-                    3
+                    $numberInt: "3"
           command_name: aggregate
           database_name: *database_name
     result:
@@ -173,7 +173,7 @@ tests:
             coll: *collection_name
           fullDocument:
             z:
-              3
+              $numberInt: "3"
   -
     description: Executing a watch helper on a Database results in notifications for changes to all collections in the specified database.
     minServerVersion: "3.8.0"
@@ -209,7 +209,7 @@ tests:
         command_started_event:
           command:
             aggregate:
-              1
+              $numberInt: "1"
             cursor: {}
             pipeline:
               - 
@@ -269,7 +269,7 @@ tests:
         command_started_event:
           command:
             aggregate:
-              1
+              $numberInt: "1"
             cursor: {}
             pipeline:
               - 
@@ -372,6 +372,7 @@ tests:
             db: *database_name
             coll: *collection_name
           updateDescription:
+            removedFields: []
             updatedFields:
               x:
                 $numberInt: "2"

data/spec/spec_tests/data/crud_v2/aggregate-merge.yml

@@ -1,6 +1,6 @@
 runOn:
     -
-        minServerVersion: "4.2.0"
+        minServerVersion: "4.1.11"
 
 data:
     - { _id: 1, x: 11 }

data/spec/spec_tests/data/crud_v2/bulkWrite-arrayFilters.yml

@@ -11,7 +11,7 @@ database_name: &database_name "crud-tests"
 
 tests:
   -
-    description: "BulkWrite with arrayFilters"
+    description: "BulkWrite updateOne with arrayFilters"
     operations:
       -
         name: "bulkWrite"
@@ -24,20 +24,13 @@ tests:
                 filter: {}
                 update: { $set: { "y.$[i].b": 2 } }
                 arrayFilters: [ { "i.b": 3 } ]
-            -
-              # UpdateMany when multiple documents match arrayFilters
-              name: "updateMany"
-              arguments:
-                filter: {}
-                update: { $set: { "y.$[i].b": 2 } }
-                arrayFilters: [ { "i.b": 1 } ]
           options: { ordered: true }
         result:
           deletedCount: 0
           insertedCount: 0
           insertedIds: {}
-          matchedCount: 3
-          modifiedCount: 3
+          matchedCount: 1
+          modifiedCount: 1
           upsertedCount: 0
           upsertedIds: {}
     expectations:
@@ -57,6 +50,35 @@ tests:
             # bypassDocumentValidation: null
           command_name: update
           database_name: *database_name
+    outcome:
+      collection:
+        data:
+          - {_id: 1, y: [{b: 2}, {b: 1}]}
+          - {_id: 2, y: [{b: 0}, {b: 1}]}
+  -
+    description: "BulkWrite updateMany with arrayFilters"
+    operations:
+      -
+        name: "bulkWrite"
+        arguments:
+          requests:
+            -
+              # UpdateMany when multiple documents match arrayFilters
+              name: "updateMany"
+              arguments:
+                filter: {}
+                update: { $set: { "y.$[i].b": 2 } }
+                arrayFilters: [ { "i.b": 1 } ]
+          options: { ordered: true }
+        result:
+          deletedCount: 0
+          insertedCount: 0
+          insertedIds: {}
+          matchedCount: 2
+          modifiedCount: 2
+          upsertedCount: 0
+          upsertedIds: {}
+    expectations:
       -
         command_started_event:
           command:
@@ -77,5 +99,5 @@ tests:
     outcome:
       collection:
         data:
-          - {_id: 1, y: [{b: 2}, {b: 2}]}
+          - {_id: 1, y: [{b: 3}, {b: 2}]}
           - {_id: 2, y: [{b: 0}, {b: 2}]}

data/spec/spec_tests/data/crud_v2/bulkWrite-delete-hint-clientError.yml

@@ -0,0 +1,63 @@
+runOn:
+  # Server versions >= 3.4.0 will return an error response for unrecognized
+  # deleteOne options. These tests check that the driver will raise an error
+  # if a hint is provided on a server version < 3.4.
+  - { maxServerVersion: "3.3.99" }
+
+data:
+  - {_id: 1, x: 11}
+  - {_id: 2, x: 22}
+  - {_id: 3, x: 33}
+  - {_id: 4, x: 44}
+
+collection_name: &collection_name 'BulkWrite_delete_hint'
+
+tests:
+  -
+    description: "BulkWrite deleteOne with hints unsupported (client-side error)"
+    operations:
+      -
+        name: "bulkWrite"
+        arguments:
+          requests:
+            -
+              name: "deleteOne"
+              arguments:
+                filter: &deleteOne_filter1 { _id: 1 }
+                hint: &hint_string "_id_"
+            -
+              name: "deleteOne"
+              arguments:
+                filter: &deleteOne_filter2 { _id: 2 }
+                hint: &hint_doc { _id: 1 }
+          options: { ordered: true }
+        error: true
+    expectations: []
+    outcome: &outcome
+      collection:
+        data:
+          - {_id: 1, x: 11 }
+          - {_id: 2, x: 22 }
+          - {_id: 3, x: 33 }
+          - {_id: 4, x: 44 }
+  -
+    description: "BulkWrite deleteMany with hints unsupported (client-side error)"
+    operations:
+      -
+        name: "bulkWrite"
+        arguments:
+          requests:
+            -
+              name: "deleteMany"
+              arguments:
+                filter: &deleteMany_filter1 { _id: { $lt: 3 } }
+                hint: *hint_string
+            -
+              name: "deleteMany"
+              arguments:
+                filter: &deleteMany_filter2 { _id: { $gte: 4 } }
+                hint: *hint_doc
+          options: { ordered: true }
+        error: true
+    expectations: []
+    outcome: *outcome

data/spec/spec_tests/data/crud_v2/bulkWrite-delete-hint-serverError.yml

@@ -0,0 +1,92 @@
+runOn:
+  # These tests assert that the driver does not raise client-side errors and
+  # instead relies on the server to raise an error. Server versions >= 3.4.0
+  # raise errors for unknown deleteOne options, and server versions >= 4.3.4
+  # support the hint option in deleteOne.
+  - { minServerVersion: "3.4.0", maxServerVersion: "4.2.99" }
+
+data:
+  - {_id: 1, x: 11}
+  - {_id: 2, x: 22}
+  - {_id: 3, x: 33}
+  - {_id: 4, x: 44}
+
+collection_name: &collection_name 'BulkWrite_delete_hint'
+
+tests:
+  -
+    description: "BulkWrite deleteOne with hints unsupported (server-side error)"
+    operations:
+      -
+        name: "bulkWrite"
+        arguments:
+          requests:
+            -
+              name: "deleteOne"
+              arguments:
+                filter: &deleteOne_filter1 { _id: 1 }
+                hint: &hint_string "_id_"
+            -
+              name: "deleteOne"
+              arguments:
+                filter: &deleteOne_filter2 { _id: 2 }
+                hint: &hint_doc { _id: 1 }
+          options: { ordered: true }
+        error: true
+    expectations:
+      -
+        command_started_event:
+          command:
+            delete: *collection_name
+            deletes:
+              -
+                q: *deleteOne_filter1
+                hint: *hint_string
+                limit: 1
+              -
+                q: *deleteOne_filter2
+                hint: *hint_doc
+                limit: 1
+            ordered: true
+    outcome: &outcome
+      collection:
+        data:
+          - {_id: 1, x: 11 }
+          - {_id: 2, x: 22 }
+          - {_id: 3, x: 33 }
+          - {_id: 4, x: 44 }
+  -
+    description: "BulkWrite deleteMany with hints unsupported (server-side error)"
+    operations:
+      -
+        name: "bulkWrite"
+        arguments:
+          requests:
+            -
+              name: "deleteMany"
+              arguments:
+                filter: &deleteMany_filter1 { _id: { $lt: 3 } }
+                hint: *hint_string
+            -
+              name: "deleteMany"
+              arguments:
+                filter: &deleteMany_filter2 { _id: { $gte: 4 } }
+                hint: *hint_doc
+          options: { ordered: true }
+        error: true
+    expectations:
+      -
+        command_started_event:
+          command:
+            delete: *collection_name
+            deletes:
+              -
+                q: *deleteMany_filter1
+                hint: *hint_string
+                limit: 0
+              -
+                q: *deleteMany_filter2
+                hint: *hint_doc
+                limit: 0
+            ordered: true
+    outcome: *outcome

data/spec/spec_tests/data/crud_v2/bulkWrite-delete-hint.yml

@@ -0,0 +1,103 @@
+runOn:
+  - { minServerVersion: "4.3.4" }
+
+data:
+  - {_id: 1, x: 11}
+  - {_id: 2, x: 22}
+  - {_id: 3, x: 33}
+  - {_id: 4, x: 44}
+
+collection_name: &collection_name 'BulkWrite_delete_hint'
+
+tests:
+  -
+    description: "BulkWrite deleteOne with hints"
+    operations:
+      -
+        name: "bulkWrite"
+        arguments:
+          requests:
+            -
+              name: "deleteOne"
+              arguments:
+                filter: &deleteOne_filter1 { _id: 1 }
+                hint: &hint_string "_id_"
+            -
+              name: "deleteOne"
+              arguments:
+                filter: &deleteOne_filter2 { _id: 2 }
+                hint: &hint_doc { _id: 1 }
+          options: { ordered: true }
+        result:
+          deletedCount: 2
+          insertedCount: 0
+          insertedIds: {}
+          matchedCount: 0
+          modifiedCount: 0
+          upsertedCount: 0
+          upsertedIds: {}
+    expectations:
+      -
+        command_started_event:
+          command:
+            delete: *collection_name
+            deletes:
+              -
+                q: *deleteOne_filter1
+                hint: *hint_string
+                limit: 1
+              -
+                q: *deleteOne_filter2
+                hint: *hint_doc
+                limit: 1
+            ordered: true
+    outcome:
+      collection:
+        data:
+          - {_id: 3, x: 33 }
+          - {_id: 4, x: 44 }
+  -
+    description: "BulkWrite deleteMany with hints"
+    operations:
+      -
+        name: "bulkWrite"
+        arguments:
+          requests:
+            -
+              name: "deleteMany"
+              arguments:
+                filter: &deleteMany_filter1 { _id: { $lt: 3 } }
+                hint: *hint_string
+            -
+              name: "deleteMany"
+              arguments:
+                filter: &deleteMany_filter2 { _id: { $gte: 4 } }
+                hint: *hint_doc
+          options: { ordered: true }
+        result:
+          deletedCount: 3
+          insertedCount: 0
+          insertedIds: {}
+          matchedCount: 0
+          modifiedCount: 0
+          upsertedCount: 0
+          upsertedIds: {}
+    expectations:
+      -
+        command_started_event:
+          command:
+            delete: *collection_name
+            deletes:
+              -
+                q: *deleteMany_filter1
+                hint: *hint_string
+                limit: 0
+              -
+                q: *deleteMany_filter2
+                hint: *hint_doc
+                limit: 0
+            ordered: true
+    outcome:
+      collection:
+        data:
+          - {_id: 3, x: 33 }

data/spec/spec_tests/data/crud_v2/bulkWrite-update-hint-clientError.yml

@@ -0,0 +1,90 @@
+runOn:
+  # Server versions >= 3.4.0 will return an error response for unrecognized
+  # updateOne options. These tests check that the driver will raise an error
+  # if a hint is provided on a server version < 3.4.
+  - { maxServerVersion: "3.3.99" }
+
+data:
+  - {_id: 1, x: 11}
+  - {_id: 2, x: 22}
+  - {_id: 3, x: 33}
+  - {_id: 4, x: 44}
+
+collection_name: &collection_name 'test_bulkwrite_update_hint'
+
+tests:
+  -
+    description: "BulkWrite updateOne with update hints unsupported (client-side error)"
+    operations:
+      -
+        name: "bulkWrite"
+        arguments:
+          requests:
+            -
+              name: "updateOne"
+              arguments:
+                filter: &updateOne_filter { _id: 1 }
+                update: &updateOne_update { $inc: { x: 1 } }
+                hint: &hint_string "_id_"
+            -
+              name: "updateOne"
+              arguments:
+                filter: *updateOne_filter
+                update: *updateOne_update
+                hint: &hint_doc { _id: 1 }
+          options: { ordered: true }
+        error: true
+    expectations: []
+    outcome: &outcome
+      collection:
+        data:
+          - {_id: 1, x: 11 }
+          - {_id: 2, x: 22 }
+          - {_id: 3, x: 33 }
+          - {_id: 4, x: 44 }
+  -
+    description: "BulkWrite updateMany with update hints unsupported (client-side error)"
+    operations:
+      -
+        name: "bulkWrite"
+        arguments:
+          requests:
+            -
+              name: "updateMany"
+              arguments:
+                filter: &updateMany_filter { _id: { $lt: 3 } }
+                update: &updateMany_update { $inc: { x: 1 } }
+                hint: *hint_string
+            -
+              name: "updateMany"
+              arguments:
+                filter: *updateMany_filter
+                update: *updateMany_update
+                hint: *hint_doc
+          options: { ordered: true }
+        error: true
+    expectations: []
+    outcome: *outcome
+  -
+    description: "BulkWrite replaceOne with update hints unsupported (client-side error)"
+    operations:
+      -
+        name: "bulkWrite"
+        arguments:
+          requests:
+            -
+              name: "replaceOne"
+              arguments:
+                filter: { _id: 3 }
+                replacement: { x: 333 }
+                hint: *hint_string
+            -
+              name: "replaceOne"
+              arguments:
+                filter: { _id: 4 }
+                replacement: { x: 444 }
+                hint: *hint_doc
+          options: { ordered: true }
+        error: true
+    expectations: []
+    outcome: *outcome