Add code to deal with renaming keys that are referenced by foreign keys
Force column types to match, include missing return