use odbc instead of pgsql
Merge branch '5156-odbc'