Query consolidator can break when queries have non-grouped aggregations

[andyrooger]

Try to run the following queries:

• SELECT x FROM table
• SELECT COUNT(*) FROM table

The QueryConsolidator combines these to SELECT "x" AS "col0", COUNT(*)::INTEGER AS "col1" FROM "table" AS "source" which obviously fails.

it('should not consolidate aggregated and non-aggregated queries', async () => {
        const qs = [];
        const c = consolidator(q => qs.push(q.request.query.toString()), voidCache(), () => {/*ignore*/});
        c.add({request: { type: 'arrow', query: Query.from({ source: 'table' }).select({ x: 'x' }) }}, Priority.Normal);
        c.add({request: { type: 'arrow', query: Query.from({ source: 'table' }).select({ x: count() }) }}, Priority.Normal);
        await new Promise(resolve => setImmediate(resolve));
        assert.equal(qs.length, 2);
    });