Oracle short string support
(cherry picked from commit b5ab7ad)