summaryrefslogtreecommitdiff
path: root/src/mongo/db/query
diff options
context:
space:
mode:
authorJ. Rassi <rassi@10gen.com>2016-06-01 17:05:33 -0400
committerJ. Rassi <rassi@10gen.com>2016-06-10 15:10:04 -0400
commitd5e278328c445b15f403312a41e82bec342e74fd (patch)
treeba969d47245f306a6e9eebc2b3b345aa2d1cec7c /src/mongo/db/query
parentdaa6badfa7548056a01c225fe3255919744b7110 (diff)
downloadmongo-d5e278328c445b15f403312a41e82bec342e74fd.tar.gz
SERVER-23611 Add InMatchExpression::setCollator() method
Also removes collator parameter from InMatchExpression constructor.
Diffstat (limited to 'src/mongo/db/query')
-rw-r--r--src/mongo/db/query/canonical_query_test.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/db/query/canonical_query_test.cpp b/src/mongo/db/query/canonical_query_test.cpp
index 3aa2d1b1b28..401e78efee1 100644
--- a/src/mongo/db/query/canonical_query_test.cpp
+++ b/src/mongo/db/query/canonical_query_test.cpp
@@ -543,8 +543,9 @@ TEST(CanonicalQueryTest, NormalizeWithInAndRegexPreservesTags) {
TEST(CanonicalQueryTest, NormalizeWithInPreservesCollator) {
CollatorInterfaceMock collator(CollatorInterfaceMock::MockType::kReverseString);
- auto inMatchExpression = stdx::make_unique<InMatchExpression>(&collator);
BSONObj obj = fromjson("{'': 'string'}");
+ auto inMatchExpression = stdx::make_unique<InMatchExpression>();
+ inMatchExpression->setCollator(&collator);
inMatchExpression->addEquality(obj.firstElement());
unique_ptr<MatchExpression> matchExpression(
CanonicalQuery::normalizeTree(inMatchExpression.release()));