Update test for update, delete and multi-column PK/FKs

Update the constraint handler to deal with these cases, which makes the
self-join check much simpler so to that first.