TEIID-2690 fix for with clause processing