SERVER-23945 make index builds without a collation inherit the collection default

Also ensures that the full BSON representation of the
collation spec associated with an index or with a collection
is materialized in the catalog.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/mongo/db/catalog/collection_options.cpp b/src/mongo/db/catalog/collection_options.cpp
index 1595706c0e2..b2aa3da4de4 100644
--- a/src/mongo/db/catalog/collection_options.cpp
+++ b/src/mongo/db/catalog/collection_options.cpp
@@ -215,6 +215,10 @@ Status CollectionOptions::parse(const BSONObj& options) {
                 return Status(ErrorCodes::BadValue, "'collation' has to be a document.");
             }
 
+            if (e.Obj().isEmpty()) {
+                return Status(ErrorCodes::BadValue, "'collation' cannot be an empty document.");
+            }
+
             collation = e.Obj().getOwned();
         }
     }