Introduce ability to on entities to have a column which is an aliased column, via the isManualField and isAggregate attributes on the column.  Updated the entity source to not add these columns as they are already added by users.  Lastly Updated the hasDQLFunction call to include if it is an aggregate (as that means it has a dql function the user manually did).