fix(NODE-4271): drop main collection first

durran · durran · commit 44735a3c82bd · 2022-05-31T15:43:00.000+02:00
diff --git a/src/operations/drop.ts b/src/operations/drop.ts
@@ -51,6 +51,9 @@ export class DropCollectionOperation extends CommandOperation<boolean> {
         encryptedFields = listCollectionsResult?.[0]?.options?.encryptedFields;
       }
 
+      // Spec tests expect the main collection to be dropped first.
+      const result = await this.executeWithoutEncryptedFieldsCheck(server, session);
+
       if (encryptedFields) {
         const escCollection = encryptedFields.escCollection || `enxcol_.${name}.esc`;
         const eccCollection = encryptedFields.eccCollection || `enxcol_.${name}.ecc`;
@@ -71,8 +74,7 @@ export class DropCollectionOperation extends CommandOperation<boolean> {
           }
         }
       }
-
-      return await this.executeWithoutEncryptedFieldsCheck(server, session);
+      return result;
     })().then(
       result => callback(undefined, result),
       err => callback(err)

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,9 @@ export class DropCollectionOperation extends CommandOperation<boolean> {`
`51`	`51`	`encryptedFields = listCollectionsResult?.[0]?.options?.encryptedFields;`
`52`	`52`	`}`
`53`	`53`
	`54`	`+ // Spec tests expect the main collection to be dropped first.`
	`55`	`+ const result = await this.executeWithoutEncryptedFieldsCheck(server, session);`
	`56`	`+`
`54`	`57`	`if (encryptedFields) {`
`55`	`58`	const escCollection = encryptedFields.escCollection \|\| `enxcol_.${name}.esc`;
`56`	`59`	const eccCollection = encryptedFields.eccCollection \|\| `enxcol_.${name}.ecc`;
`@@ -71,8 +74,7 @@ export class DropCollectionOperation extends CommandOperation<boolean> {`
`71`	`74`	`}`
`72`	`75`	`}`
`73`	`76`	`}`
`74`		`-`
`75`		`- return await this.executeWithoutEncryptedFieldsCheck(server, session);`
	`77`	`+ return result;`
`76`	`78`	`})().then(`
`77`	`79`	`result => callback(undefined, result),`
`78`	`80`	`err => callback(err)`