Merge pull request #33307 from aesteves60/add-collation-findOne

fix(mongodb): add collation option to findOneAndReplace and FindOneAn…
This commit is contained in:
Nathan Shively-Sanders
2019-03-07 07:57:53 -08:00
committed by GitHub
+13 -12
View File
@@ -876,17 +876,8 @@ export interface Collection<TSchema = Default> {
findOne<T = TSchema>(filter: FilterQuery<TSchema>, options: FindOneOptions, callback: MongoCallback<T | null>): void;
/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#findOneAndDelete */
findOneAndDelete(filter: FilterQuery<TSchema>, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
findOneAndDelete(filter: FilterQuery<TSchema>, options?: { projection?: object, sort?: object, maxTimeMS?: number, session?: ClientSession }): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
findOneAndDelete(
filter: FilterQuery<TSchema>,
options: {
projection?: object,
sort?: object,
maxTimeMS?: number,
session?: ClientSession
},
callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>
): void;
findOneAndDelete(filter: FilterQuery<TSchema>, options?: FindOneAndDeleteOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
findOneAndDelete(filter: FilterQuery<TSchema>, options: FindOneAndDeleteOption, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#findOneAndReplace */
findOneAndReplace(filter: FilterQuery<TSchema>, replacement: object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
findOneAndReplace(filter: FilterQuery<TSchema>, replacement: object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
@@ -1317,7 +1308,7 @@ export interface CollectionAggregationOptions {
* Allow driver to bypass schema validation in MongoDB 3.2 or higher.
*/
bypassDocumentValidation?: boolean;
hint?: string | object;
hint?: string | object;
raw?: boolean;
promoteLongs?: boolean;
promoteValues?: boolean;
@@ -1432,6 +1423,7 @@ export interface FindOneAndReplaceOption extends CommonOptions {
maxTimeMS?: number;
upsert?: boolean;
returnOriginal?: boolean;
collation?: CollationDocument;
}
/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#findOneAndUpdate */
@@ -1439,6 +1431,15 @@ export interface FindOneAndUpdateOption extends FindOneAndReplaceOption {
arrayFilters?: object[];
}
/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#findOneAndDelete */
export interface FindOneAndDeleteOption {
projection?: object;
sort?: object;
maxTimeMS?: number;
session?: ClientSession;
collation?: CollationDocument;
}
/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#geoHaystackSearch */
export interface GeoHaystackSearchOptions {
readPreference?: ReadPreference | string;