[SP-669]: Backport Hive 2 database dialect