TEIID-2815 exposing aggregate functions and removing function form