fix citext resolution issues#1629

kyleconroy merged 3 commits intosqlc-dev:mainsqlc-dev/sqlc:mainfrom

ryan-berger:mainryan-berger/sqlc:mainCopy head branch name to clipboard