* appropriate work queue entries. We do this before dropping because in
* the case of a FOREIGN KEY constraint, we might not yet have exclusive
* lock on the table the constraint is attached to, and we need to get
- * that before dropping. It's safe because the parser won't actually look
- * at the catalogs to detect the existing entry.
+ * that before reparsing/dropping.
*
* We can't rely on the output of deparsing to tell us which relation to
* operate on, because concurrent activity might have made the name
Form_pg_constraint con;
Oid relid;
Oid confrelid;
+ char contype;
bool conislocal;
tup = SearchSysCache1(CONSTROID, ObjectIdGetDatum(oldId));
elog(ERROR, "could not identify relation associated with constraint %u", oldId);
}
confrelid = con->confrelid;
+ contype = con->contype;
conislocal = con->conislocal;
ReleaseSysCache(tup);
- ObjectAddressSet(obj, ConstraintRelationId, lfirst_oid(oid_item));
+ ObjectAddressSet(obj, ConstraintRelationId, oldId);
add_exact_object_address(&obj, objects);
/*
if (!conislocal)
continue;
+ /*
+ * When rebuilding an FK constraint that references the table we're
+ * modifying, we might not yet have any lock on the FK's table, so get
+ * one now. We'll need AccessExclusiveLock for the DROP CONSTRAINT
+ * step, so there's no value in asking for anything weaker.
+ */
+ if (relid != tab->relid && contype == CONSTRAINT_FOREIGN)
+ LockRelationOid(relid, AccessExclusiveLock);
+
ATPostAlterTypeParse(oldId, relid, confrelid,
(char *) lfirst(def_item),
wqueue, lockmode, tab->rewrite);
(char *) lfirst(def_item),
wqueue, lockmode, tab->rewrite);
- ObjectAddressSet(obj, RelationRelationId, lfirst_oid(oid_item));
+ ObjectAddressSet(obj, RelationRelationId, oldId);
add_exact_object_address(&obj, objects);
}