fix odbc regressions (#15009) [backport]
fix odbc regressions (#15009) [backport]

* fix odbc regressions

* make only necessary changes
dom96/Nim,dom96/Nim,dom96/Nim,dom96/Nim,dom96/Nim,dom96/Nim,dom96/Nim