TEIID-2876 removing resolving dependency on function ordering