Split the Equivalencies into two (column and FK), adding the former to
the latter for finding FK joins, and the former left alone for general
processing. 

Add test case as explained by Merge comments to ensure correct
processing.