SERVER-37124 Disambiguate DuplicateKey error and return keyPattern details in errorInfo object

2 files changed, 6 insertions, 5 deletions

diff --git a/src/mongo/bson/util/bson_check.h b/src/mongo/bson/util/bson_check.h
index 250256208ba..ba9407353cf 100644
--- a/src/mongo/bson/util/bson_check.h
+++ b/src/mongo/bson/util/bson_check.h
@@ -43,8 +43,8 @@ namespace mongo {
  * Confirms that obj only contains field names where allowed(name) returns true,
  * and that no field name occurs multiple times.
  *
- * On failure, returns BadValue and a message naming the unexpected field or DuplicateKey and a
- * message naming the repeated field.  "objectName" is included in the message, for reporting
+ * On failure, returns BadValue and a message naming the unexpected field or error code 51000 with
+ * a message naming a repeated field.  "objectName" is included in the message, for reporting
  * purposes.
  */
 template <typename Condition>
@@ -65,7 +65,7 @@ Status bsonCheckOnlyHasFieldsImpl(StringData objectName,
         if (!seenBefore) {
             seenBefore = true;
         } else {
-            return Status(ErrorCodes::DuplicateKey,
+            return Status(ErrorCodes::Error(51000),
                           str::stream() << "Field " << name << " appears multiple times in "
                                         << objectName);
         }
diff --git a/src/mongo/bson/util/bson_check_test.cpp b/src/mongo/bson/util/bson_check_test.cpp
index 6c2fa1e0ca7..955af664a21 100644
--- a/src/mongo/bson/util/bson_check_test.cpp
+++ b/src/mongo/bson/util/bson_check_test.cpp
@@ -77,9 +77,10 @@ TEST(BsonCheck, CheckHasOnlyLegalFields) {
 }
 
 TEST(BsonCheck, CheckNoDuplicates) {
-    ASSERT_EQUALS(ErrorCodes::DuplicateKey,
+    ASSERT_EQUALS(51000,
                   bsonCheckOnlyHasFields(
-                      "", BSON("aField" << 1 << "anotherField" << 2 << "aField" << 3), legals));
+                      "", BSON("aField" << 1 << "anotherField" << 2 << "aField" << 3), legals)
+                      .code());
 }
 
 }  // namespace