Fix identifier length problem with Oracle
(cherry-picked from ef6a4d6)