query designer - grop filter (having clause)

packages/sqltree/src/dumpSqlCommand.ts

@@ -36,6 +36,11 @@ export function dumpSqlSelect(dmp: SqlDumper, cmd: Select) {
     dmp.putCollection(', ', cmd.groupBy, (expr) => dumpSqlExpression(dmp, expr));
     dmp.put('&n');
   }
+  if (cmd.having) {
+    dmp.put('&n^having ');
+    dumpSqlCondition(dmp, cmd.having);
+    dmp.put('&n');
+  }
   if (cmd.orderBy) {
     dmp.put('&n^order ^by ');
     dmp.putCollection(', ', cmd.orderBy, (expr) => {

packages/sqltree/src/types.ts

@@ -16,6 +16,7 @@ export interface Select {
   orderBy?: OrderByExpression[];
   groupBy?: Expression[];
   where?: Condition;
+  having?: Condition;
 }
 
 export type UpdateField = Expression & { targetColumn: string };

packages/web/src/designer/DesignerQueryDumper.ts

@@ -1,5 +1,14 @@
 import _ from 'lodash';
-import { dumpSqlSelect, Select, JoinType, Condition, Relation, mergeConditions, Source } from 'dbgate-sqltree';
+import {
+  dumpSqlSelect,
+  Select,
+  JoinType,
+  Condition,
+  Relation,
+  mergeConditions,
+  Source,
+  ResultField,
+} from 'dbgate-sqltree';
 import { EngineDriver } from 'dbgate-types';
 import { DesignerInfo, DesignerTableInfo, DesignerReferenceInfo, DesignerJoinType } from './types';
 import { DesignerComponent } from './DesignerComponentCreator';
@@ -93,34 +102,28 @@ export class DesignerQueryDumper {
     }
   }
 
-  run() {
+  addGroupConditions(select: Select, tables: DesignerTableInfo[], selectIsGrouped: boolean) {
-    let res: Select = null;
+    for (const column of this.designer.columns || []) {
-    for (const component of this.components) {
+      if (!column.groupFilter) continue;
-      const select = this.dumpComponent(component);
+      const table = (this.designer.tables || []).find((x) => x.designerId == column.designerId);
-      if (res == null) res = select;
+      if (!table) continue;
-      else res = mergeSelectsFromDesigner(res, select);
+      if (!tables.find((x) => x.designerId == table.designerId)) continue;
-    }
 
-    // top level cross join conditions
+      const condition = parseFilter(column.groupFilter, findDesignerFilterType(column, this.designer));
-    const topLevelTables = this.topLevelTables;
+      if (condition) {
-    for (const ref of this.designer.references || []) {
+        select.having = mergeConditions(
-      if (referenceIsCrossJoin(ref) && referenceIsConnecting(ref, topLevelTables, topLevelTables)) {
+          select.having,
-        res.where = mergeConditions(res.where, {
+          _.cloneDeepWith(condition, (expr) => {
-          conditionType: 'and',
+            if (expr.exprType == 'placeholder') {
-          conditions: getReferenceConditions(ref, this.designer),
+              return this.getColumnOutputExpression(column, selectIsGrouped);
-        });
             }
-    }
+          })
-
-    const topLevelColumns = (this.designer.columns || []).filter((col) =>
-      topLevelTables.find((tbl) => tbl.designerId == col.designerId)
         );
-    const selectIsGrouped = !!topLevelColumns.find((x) => x.isGrouped || (x.aggregate && x.aggregate != '---'));
+      }
-    const outputColumns = topLevelColumns.filter((x) => x.isOutput);
+    }
-    if (outputColumns.length == 0) {
+  }
-      res.selectAll = true;
+
-    } else {
+  getColumnOutputExpression(col, selectIsGrouped): ResultField {
-      res.columns = outputColumns.map((col) => {
     const source = findQuerySource(this.designer, col.designerId);
     const { columnName } = col;
     let { alias } = col;
@@ -150,8 +153,37 @@ export class DesignerQueryDumper {
         source,
       };
     }
+  }
+
+  run() {
+    let res: Select = null;
+    for (const component of this.components) {
+      const select = this.dumpComponent(component);
+      if (res == null) res = select;
+      else res = mergeSelectsFromDesigner(res, select);
+    }
+
+    // top level cross join conditions
+    const topLevelTables = this.topLevelTables;
+    for (const ref of this.designer.references || []) {
+      if (referenceIsCrossJoin(ref) && referenceIsConnecting(ref, topLevelTables, topLevelTables)) {
+        res.where = mergeConditions(res.where, {
+          conditionType: 'and',
+          conditions: getReferenceConditions(ref, this.designer),
         });
       }
+    }
+
+    const topLevelColumns = (this.designer.columns || []).filter((col) =>
+      topLevelTables.find((tbl) => tbl.designerId == col.designerId)
+    );
+    const selectIsGrouped = !!topLevelColumns.find((x) => x.isGrouped || (x.aggregate && x.aggregate != '---'));
+    const outputColumns = topLevelColumns.filter((x) => x.isOutput);
+    if (outputColumns.length == 0) {
+      res.selectAll = true;
+    } else {
+      res.columns = outputColumns.map((col) => this.getColumnOutputExpression(col, selectIsGrouped));
+    }
 
     const groupedColumns = topLevelColumns.filter((x) => x.isGrouped);
     if (groupedColumns.length > 0) {
@@ -176,6 +208,7 @@ export class DesignerQueryDumper {
     }
 
     this.addConditions(res, topLevelTables);
+    this.addGroupConditions(res, topLevelTables, selectIsGrouped);
 
     return res;
   }

packages/web/src/designer/QueryDesignColumns.js

@@ -38,6 +38,8 @@ export default function QueryDesignColumns({ value, onChange }) {
     [onChange]
   );
 
+  const hasGroupedColumn = !!(columns || []).find((x) => x.isGrouped);
+
   return (
     <TableControl rows={columns || []}>
       <TableColumn fieldName="columnName" header="Column/Expression" />
@@ -136,6 +138,21 @@ export default function QueryDesignColumns({ value, onChange }) {
           />
         )}
       />
+      {hasGroupedColumn && (
+        <TableColumn
+          fieldName="groupFilter"
+          header="Group filter"
+          formatter={(row) => (
+            <DataFilterControl
+              filterType={findDesignerFilterType(row, value)}
+              filter={row.groupFilter}
+              setFilter={(groupFilter) => {
+                changeColumn({ ...row, groupFilter });
+              }}
+            />
+          )}
+        />
+      )}
       <TableColumn
         fieldName="actions"
         header=""

packages/web/src/designer/types.ts

@@ -29,7 +29,8 @@ export type DesignerColumnInfo = {
   aggregate?: string;
   isOutput?: boolean;
   sortOrder?: number;
-  filter: string;
+  filter?: string;
+  groupFilter?: string;
 };
 
 export type DesignerInfo = {