TEIID-2366 fix for predicate rewrite