Merge cockroachdb#59985

59985: sql: fail type descriptor validation if referenced descriptor is dropped r=otan a=arulajmani Previously, when a type descriptor was validated for cross references, we weren't checking if the referenced table descriptor was dropped. This seems erroneous, as before a table descriptor is dropped, it should unlink itself from type descriptors that hold a backreference to it. This patch validates as such. Release note: None Co-authored-by: arulajmani <[email protected]>
tbg · Feb 8, 2021 · 5b33e6d · 5b33e6d
2 parents e3a3da3 + 098c5b8
commit 5b33e6d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pkg/sql/catalog/typedesc/type_desc.go b/pkg/sql/catalog/typedesc/type_desc.go
@@ -636,9 +636,14 @@ func (desc *Immutable) Validate(ctx context.Context, dg catalog.DescGetter) erro
 	// Validate that all of the referencing descriptors exist.
 	tableExists := func(id descpb.ID) func(got catalog.Descriptor) error {
 		return func(got catalog.Descriptor) error {
-			if _, isTable := got.(catalog.TableDescriptor); !isTable {
+			tableDesc, isTable := got.(catalog.TableDescriptor)
+			if !isTable {
 				return errors.AssertionFailedf("referencing descriptor %d does not exist", id)
 			}
+			if tableDesc.Dropped() {
+				return errors.AssertionFailedf(
+					"referencing descriptor %d was dropped without dependency unlinking", id)
+			}
 			return nil
 		}
 	}