diff options
| -rw-r--r-- | src/backend/catalog/dependency.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c index 35290847bd9..6b8c7357e1d 100644 --- a/src/backend/catalog/dependency.c +++ b/src/backend/catalog/dependency.c @@ -102,6 +102,7 @@ typedef struct #define DEPFLAG_INTERNAL 0x0008 /* reached via internal dependency */ #define DEPFLAG_EXTENSION 0x0010 /* reached via extension dependency */ #define DEPFLAG_REVERSE 0x0020 /* reverse internal/extension link */ +#define DEPFLAG_SUBOBJECT 0x0040 /* subobject of another deletable object */ /* expansible list of ObjectAddresses */ @@ -886,6 +887,10 @@ reportDependentObjects(const ObjectAddresses *targetObjects, if (extra->flags & DEPFLAG_ORIGINAL) continue; + /* Also ignore sub-objects; we'll report the whole object elsewhere */ + if (extra->flags & DEPFLAG_SUBOBJECT) + continue; + objDesc = getObjectDescription(obj); /* @@ -2320,13 +2325,19 @@ object_address_present_add_flags(const ObjectAddress *object, * DROP COLUMN action even though we know we're gonna delete * the table later. * + * What we can do, though, is mark this as a subobject so that + * we don't report it separately, which is confusing because + * it's unpredictable whether it happens or not. But do so + * only if flags != 0 (flags == 0 is a read-only probe). + * * Because there could be other subobjects of this object in * the array, this case means we always have to loop through * the whole array; we cannot exit early on a match. */ ObjectAddressExtra *thisextra = addrs->extras + i; - thisextra->flags |= flags; + if (flags) + thisextra->flags |= (flags | DEPFLAG_SUBOBJECT); } } } @@ -2374,7 +2385,8 @@ stack_address_present_add_flags(const ObjectAddress *object, * object_address_present_add_flags(), we should propagate * flags for the whole object to each of its subobjects. */ - stackptr->flags |= flags; + if (flags) + stackptr->flags |= (flags | DEPFLAG_SUBOBJECT); } } } |