workload/schemachange: screen for errors in dropSchema op

Release note: None
cockroachdb · Nov 12, 2020 · 6ebfb07 · 6ebfb07
1 parent 79046d3
commit 6ebfb07
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/pkg/workload/schemachange/operation_generator.go b/pkg/workload/schemachange/operation_generator.go
@@ -92,6 +92,7 @@ var opsWithExecErrorScreening = map[opType]bool{
 	dropColumn:        true,
 	dropColumnDefault: true,
 	dropColumnNotNull: true,
+	dropSchema:        true,
 
 	renameColumn: true,
 	renameTable:  true,
@@ -1473,6 +1474,16 @@ func (og *operationGenerator) dropSchema(tx *pgx.Tx) (string, error) {
 	if err != nil {
 		return "", err
 	}
+
+	schemaExists, err := schemaExists(tx, schemaName)
+	if err != nil {
+		return "", err
+	}
+	codesWithConditions{
+		{pgcode.UndefinedSchema, !schemaExists},
+		{pgcode.InvalidSchemaName, schemaName == tree.PublicSchema},
+	}.add(og.expectedExecErrors)
+
 	return fmt.Sprintf(`DROP SCHEMA "%s" CASCADE`, schemaName), nil
 }