fix: only ecc collection affected

Author: durran

src/operations/create_collection.ts

@@ -137,6 +137,20 @@ export class CreateCollectionOperation extends CommandOperation<Collection> {
         if (server.description.maxWireVersion < MIN_SUPPORTED_QE_WIRE_VERSION) {
           throw new MongoCompatibilityError(INVALID_QE_VERSION);
         }
+        // Create auxilliary collections for queryable encryption support.
+        const escCollection = encryptedFields.escCollection ?? `enxcol_.${name}.esc`;
+        const ecocCollection = encryptedFields.ecocCollection ?? `enxcol_.${name}.ecoc`;
+
+        for (const collectionName of [escCollection, ecocCollection]) {
+          const createOp = new CreateCollectionOperation(db, collectionName, {
+            clusteredIndex: {
+              key: { _id: 1 },
+              unique: true
+            }
+          });
+          await createOp.executeWithoutEncryptedFieldsCheck(server, session);
+        }
+
         if (!options.encryptedFields) {
           this.options = { ...this.options, encryptedFields };
         }

src/operations/drop.ts

@@ -1,5 +1,6 @@
 import type { Document } from '../bson';
 import type { Db } from '../db';
+import { MONGODB_ERROR_CODES, MongoServerError } from '../error';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
 import type { Callback } from '../utils';
@@ -14,10 +15,14 @@ export interface DropCollectionOptions extends CommandOperationOptions {
 
 /** @internal */
 export class DropCollectionOperation extends CommandOperation<boolean> {
+  override options: DropCollectionOptions;
+  db: Db;
   name: string;
 
   constructor(db: Db, name: string, options: DropCollectionOptions = {}) {
     super(db, options);
+    this.db = db;
+    this.options = options;
     this.name = name;
   }
 
@@ -27,6 +32,45 @@ export class DropCollectionOperation extends CommandOperation<boolean> {
     callback: Callback<boolean>
   ): void {
     (async () => {
+      const db = this.db;
+      const options = this.options;
+      const name = this.name;
+
+      const encryptedFieldsMap = db.s.client.options.autoEncryption?.encryptedFieldsMap;
+      let encryptedFields: Document | undefined =
+        options.encryptedFields ?? encryptedFieldsMap?.[`${db.databaseName}.${name}`];
+
+      if (!encryptedFields && encryptedFieldsMap) {
+        // If the MongoClient was configured with an encryptedFieldsMap,
+        // and no encryptedFields config was available in it or explicitly
+        // passed as an argument, the spec tells us to look one up using
+        // listCollections().
+        const listCollectionsResult = await db
+          .listCollections({ name }, { nameOnly: false })
+          .toArray();
+        encryptedFields = listCollectionsResult?.[0]?.options?.encryptedFields;
+      }
+
+      if (encryptedFields) {
+        const escCollection = encryptedFields.escCollection || `enxcol_.${name}.esc`;
+        const ecocCollection = encryptedFields.ecocCollection || `enxcol_.${name}.ecoc`;
+
+        for (const collectionName of [escCollection, ecocCollection]) {
+          // Drop auxilliary collections, ignoring potential NamespaceNotFound errors.
+          const dropOp = new DropCollectionOperation(db, collectionName);
+          try {
+            await dropOp.executeWithoutEncryptedFieldsCheck(server, session);
+          } catch (err) {
+            if (
+              !(err instanceof MongoServerError) ||
+              err.code !== MONGODB_ERROR_CODES.NamespaceNotFound
+            ) {
+              throw err;
+            }
+          }
+        }
+      }
+
       return this.executeWithoutEncryptedFieldsCheck(server, session);
     })().then(
       result => callback(undefined, result),