Add column mapping for reserved "primary" word
Fix constraint type