migration add varchar and char support
(cherry picked from commit a17854bd2babbaac1079647227f6f3f77ee65f9d)
Merge remote-tracking branch 'remotes/upstream/2.2' into 2.2