Correct handling of compound foreign key constraints that include the

integer primary key as one of the columns.  
Ticket [ce7c133ea6cc9ccdc1]

FossilOrigin-Name: 53902f7d4a46aa70ecc5bf180a01ff888d52686a