TEIID-2537: reverting the earlier change, and correcting the logic in od...

...ata translator to correctly account for the return types