Skip to content

SWIFT-621 Provide default values for WriteModel options associated values #439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 2, 2020
Merged

SWIFT-621 Provide default values for WriteModel options associated values #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc1f862
add default values for WriteModel options parameters
patrickfreed Apr 1, 2020
c756bf3
update tests
patrickfreed Apr 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Sources/MongoSwift/MongoCollection+BulkWrite.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ public enum WriteModel<CollectionType: Codable> {
/// Parameters:
/// - A `Document` representing the match criteria.
/// - `options`: Optional `DeleteModelOptions`.
case deleteOne(Document, options: DeleteModelOptions?)
case deleteOne(Document, options: DeleteModelOptions? = nil)
/// A `deleteMany`.
/// Parameters:
/// - A `Document` representing the match criteria.
/// - `options`: Optional `DeleteModelOptions`.
case deleteMany(Document, options: DeleteModelOptions?)
case deleteMany(Document, options: DeleteModelOptions? = nil)
/// An `insertOne`.
/// Parameters:
/// - A `T` to insert.
Expand All @@ -58,19 +58,19 @@ public enum WriteModel<CollectionType: Codable> {
/// - `filter`: A `Document` representing the match criteria.
/// - `replacement`: A `T` to use as the replacement value.
/// - `options`: Optional `ReplaceOneModelOptions`.
case replaceOne(filter: Document, replacement: CollectionType, options: ReplaceOneModelOptions?)
case replaceOne(filter: Document, replacement: CollectionType, options: ReplaceOneModelOptions? = nil)
/// An `updateOne`.
/// Parameters:
/// - `filter`: A `Document` representing the match criteria.
/// - `update`: A `Document` containing update operators.
/// - `options`: Optional `UpdateModelOptions`.
case updateOne(filter: Document, update: Document, options: UpdateModelOptions?)
case updateOne(filter: Document, update: Document, options: UpdateModelOptions? = nil)
/// An `updateMany`.
/// Parameters:
/// - `filter`: A `Document` representing the match criteria.
/// - `update`: A `Document` containing update operators.
/// - `options`: Optional `UpdateModelOptions`.
case updateMany(filter: Document, update: Document, options: UpdateModelOptions?)
case updateMany(filter: Document, update: Document, options: UpdateModelOptions? = nil)

/// Adds this model to the provided `mongoc_bulk_t`, using the provided encoder for encoding options and
/// `CollectionType` values if needed. If this is an `insertOne`, returns the `_id` field of the inserted
Expand Down
14 changes: 7 additions & 7 deletions Tests/MongoSwiftSyncTests/MongoCollection+BulkWriteTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ final class MongoCollection_BulkWriteTests: MongoSwiftTestCase {
try self.createFixtures(4)

let requests: [WriteModel<Document>] = [
.updateOne(filter: ["_id": 2], update: ["$inc": ["x": 1]], options: nil),
.updateMany(filter: ["_id": ["$gt": 2]], update: ["$inc": ["x": -1]], options: nil),
.updateOne(filter: ["_id": 2], update: ["$inc": ["x": 1]]),
.updateMany(filter: ["_id": ["$gt": 2]], update: ["$inc": ["x": -1]]),
.updateOne(
filter: ["_id": 5],
update: ["$set": ["x": 55]],
Expand All @@ -135,7 +135,7 @@ final class MongoCollection_BulkWriteTests: MongoSwiftTestCase {
update: ["$set": ["x": 66]],
options: UpdateModelOptions(upsert: true)
),
.updateMany(filter: ["x": ["$gt": 50]], update: ["$inc": ["x": 1]], options: nil)
.updateMany(filter: ["x": ["$gt": 50]], update: ["$inc": ["x": 1]])
]

let result: BulkWriteResult! = try self.coll.bulkWrite(requests)
Expand All @@ -160,8 +160,8 @@ final class MongoCollection_BulkWriteTests: MongoSwiftTestCase {
try self.createFixtures(4)

let requests: [WriteModel<Document>] = [
.deleteOne(["_id": 1], options: nil),
.deleteMany(["_id": ["$gt": 2]], options: nil)
.deleteOne(["_id": 1]),
.deleteMany(["_id": ["$gt": 2]])
]

let result: BulkWriteResult! = try self.coll.bulkWrite(requests)
Expand All @@ -182,9 +182,9 @@ final class MongoCollection_BulkWriteTests: MongoSwiftTestCase {
update: ["$inc": ["x": 1]],
options: nil
),
.updateMany(filter: ["_id": ["$gt": 1]], update: ["$inc": ["x": 1]], options: nil),
.updateMany(filter: ["_id": ["$gt": 1]], update: ["$inc": ["x": 1]]),
.insertOne(["_id": 4]),
.deleteMany(["x": ["$nin": [24, 34]]], options: nil),
.deleteMany(["x": ["$nin": [24, 34]]]),
.replaceOne(
filter: ["_id": 4],
replacement: ["_id": 4, "x": 44],
Expand Down