@hypequery/clickhouse 1.6.1 → 2.0.0

package/dist/core/features/aggregations.js

@@ -3,19 +3,31 @@ export class AggregationFeature {
     constructor(builder) {
         this.builder = builder;
     }
+    inferGroupBySelections(select) {
+        return select
+            .map(item => item.selection)
+            .filter(selection => selection !== '*')
+            .map(selection => {
+            const aliasMatch = selection.match(/\s+AS\s+([A-Za-z_][A-Za-z0-9_]*)$/i);
+            return {
+                kind: 'group-by-item',
+                expression: aliasMatch ? aliasMatch[1] : selection,
+            };
+        });
+    }
     createAggregation(column, fn, alias) {
         const aggregationSQL = `${fn}(${column}) AS ${alias}`;
-        const config = this.builder.getConfig();
-        if (config.select) {
+        const query = this.builder.getQueryNode();
+        if (query.select) {
             return {
-                ...config,
-                select: [...(config.select || []).map(String), aggregationSQL],
-                groupBy: (config.select || []).map(String).filter(col => !col.includes(' AS '))
+                ...query,
+                select: [...query.select, { kind: 'selection', selection: aggregationSQL }],
+                groupBy: query.groupBy || this.inferGroupBySelections(query.select)
             };
         }
         return {
-            ...config,
-            select: [aggregationSQL]
+            ...query,
+            select: [{ kind: 'selection', selection: aggregationSQL }]
         };
     }
     sum(column, alias) {