Add relationship type support to TokenContext
Resolving tokens in the ast for the new planner