@quillsql/react 2.13.43 → 2.13.45

package/dist/cjs/utils/astProcessing.d.ts

@@ -54,10 +54,20 @@ export declare const createBasicSelectASTFromColumns: (columns: ColumnInternal[]
     orderby: null;
     limit: null;
 };
-export declare const fetchAndProcessASTFromPrompt: (aiPrompt: string, schema: Table[], client: QuillProviderClient, prevPivot?: Pivot, currentQuery?: string, prevTable?: string, dashboardName?: string, tenants?: {
-    tenantField: string;
-    tenantIds: (string | number)[];
-}[] | (string | number)[]) => Promise<{
+export declare const createSelectStarFromAst: (ast: any) => any;
+export declare const fetchAndProcessASTFromPrompt: ({ aiPrompt, schema, client, prevPivot, currentQuery, prevTable, dashboardName, tenants, }: {
+    aiPrompt: string;
+    schema: Table[];
+    client: QuillProviderClient;
+    prevPivot?: Pivot;
+    currentQuery?: string;
+    prevTable?: string;
+    dashboardName: string;
+    tenants?: {
+        tenantField: string;
+        tenantIds: (string | number)[];
+    }[] | (string | number)[];
+}) => Promise<{
     ast: any;
     pivot: Pivot | null | undefined;
     whereAST: any;

package/dist/cjs/utils/astProcessing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"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"}

package/dist/cjs/utils/astProcessing.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchASTFromQuillReport = exports.fetchAndProcessASTFromPrompt = exports.createBasicSelectASTFromColumns = exports.getAllPossibleColumns = exports.isSubquery = void 0;
+exports.fetchASTFromQuillReport = exports.fetchAndProcessASTFromPrompt = exports.createSelectStarFromAst = exports.createBasicSelectASTFromColumns = exports.getAllPossibleColumns = exports.isSubquery = void 0;
 exports.getSelectFromAST = getSelectFromAST;
 exports.processStarColumn = processStarColumn;
 exports.recursiveSearchByKey = recursiveSearchByKey;
@@ -185,6 +185,9 @@ function getColumnAndTableInfo(tableAliasMap, column, schemaInfo) {
     return { tableName, columnName };
 }
 function getColumnsByTableFromASTAndSchema(ast, tables, tableAliasMap, skipStar = false) {
+    if (!ast || !ast.columns) {
+        return {};
+    }
     const referencedColumns = {};
     if (!skipStar &&
         (ast?.columns === '*' || ast?.columns?.[0]?.expr?.column === '*')) {
@@ -362,8 +365,24 @@ const createBasicSelectASTFromColumns = (columns, tableName) => {
     };
 };
 exports.createBasicSelectASTFromColumns = createBasicSelectASTFromColumns;
+const createSelectStarFromAst = (ast) => {
+    return {
+        ...ast,
+        columns: [
+            {
+                expr: {
+                    type: 'column_ref',
+                    table: null,
+                    column: '*',
+                },
+                as: null,
+            },
+        ],
+    };
+};
+exports.createSelectStarFromAst = createSelectStarFromAst;
 //TODO: Move all fetches to a /sdk route
-const fetchAndProcessASTFromPrompt = async (aiPrompt, schema, client, prevPivot, currentQuery, prevTable, dashboardName, tenants) => {
+const fetchAndProcessASTFromPrompt = async ({ aiPrompt, schema, client, prevPivot, currentQuery, prevTable, dashboardName, tenants, }) => {
     let res, data, ast, newAst, pivot;
     let numRetries = 0;
     let whereAST;
@@ -428,13 +447,28 @@ const fetchAndProcessASTFromPrompt = async (aiPrompt, schema, client, prevPivot,
         if (!tableInfo) {
             throw new Error('Table info not found');
         }
-        const uniqueValues = await (0, tableProcessing_1.getUniqueStringValues)(tableInfo.columns, processedName, client, tenants, undefined, undefined, undefined, undefined, dashboardName);
+        const uniqueValues = await (0, tableProcessing_1.getUniqueStringValuesByColumn)({
+            columns: tableInfo.columns,
+            tableName: processedName,
+            client,
+            tenants,
+            dashboardName,
+        });
         newAst = (0, convert_1.convertUnaryToBinary)(newAst);
         newAst = (0, util_1.removeNonSelectedTableReferences)(newAst, processedName, tableInfo.columns.map((col) => col.field), uniqueValues);
         if (pivot) {
             newAst = (0, util_1.deepCopy)({ ...newAst, orderby: null, limit: null });
         }
         whereAST = (0, util_1.deepCopy)(newAst.where);
+        const _columns = schema.find((_table) => {
+            return _table.name === table;
+        })?.columns;
+        // parse the whereAst first
+        const filterTree = (0, astFilterProcessing_1.astToFilterTree)(whereAST, client.databaseType?.toLowerCase() || 'postgresql', _columns);
+        const cleanAst = filterTree
+            ? (0, astFilterProcessing_1.filterTreeToAst)(filterTree, client.databaseType?.toLowerCase() || 'postgresql')
+            : null;
+        whereAST = cleanAst;
     }
     catch (e) {
         console.log(e);
@@ -455,7 +489,7 @@ const fetchASTFromQuillReport = async (report, client, schema) => {
     let groupByPivot = null;
     let schemaInfo = [];
     try {
-        if (!report || report.referencedTables?.length !== 1) {
+        if (!report) {
             throw new Error('Report not found');
         }
         const url = `${constants_1.QUILL_SERVER}/astify`;

package/dist/cjs/utils/dashboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAcvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAOzD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAsB/C;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,EACvC,IAAI,EACJ,gBAAgB,EAChB,MAAM,EACN,UAAU,EACV,oBAAoB,EACpB,YAAY,EACZ,cAAc,GACf,EAAE;IACD,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GAAG,SAAS,CAAC;IACzC,gBAAgB,EAAE,GAAG,CAAC;IACtB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,YAAY,CAAC,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7D,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAqK/B;AA2ID,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,CAAC,EACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EACvB,KAAK,CAAC,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,GAAG,CAAC,CA6Bd"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAcvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAOzD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAsB/C;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,EACvC,IAAI,EACJ,gBAAgB,EAChB,MAAM,EACN,UAAU,EACV,oBAAoB,EACpB,YAAY,EACZ,cAAc,GACf,EAAE;IACD,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GAAG,SAAS,CAAC;IACzC,gBAAgB,EAAE,GAAG,CAAC;IACtB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,YAAY,CAAC,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7D,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAsL/B;AA2ID,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,CAAC,EACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EACvB,KAAK,CAAC,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,GAAG,CAAC,CA6Bd"}

package/dist/cjs/utils/dashboard.js

@@ -73,7 +73,15 @@ async function cleanDashboardItem({ item, dashboardFilters, client, dateBucket,
         return { ...col, label: (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(col.label) };
     });
     const columnInternal = (item.includeCustomFields ? columnsWithCustomFields : item.columns).map((col) => {
-        return { ...col, label: (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(col.label) };
+        const field = item.fields?.find((f) => f.name === col.field);
+        const converted_field = (0, columnProcessing_1.convertPostgresColumn)(field ?? {});
+        return {
+            fieldType: converted_field.fieldType,
+            dataTypeID: converted_field.dataTypeID,
+            jsType: converted_field.jsType,
+            ...col,
+            label: (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(col.label),
+        };
     });
     let pivotTable;
     let pivotError;
@@ -117,10 +125,16 @@ async function cleanDashboardItem({ item, dashboardFilters, client, dateBucket,
     if (item.referenceLines) {
         for (const referenceLine of item.referenceLines) {
             if (Array.isArray(referenceLine.query)) {
-                referenceLineYValues.push({ label: referenceLine.label, query: referenceLine.query });
+                referenceLineYValues.push({
+                    label: referenceLine.label,
+                    query: referenceLine.query,
+                });
             }
             else if (referenceLine.query === '') {
-                referenceLineYValues.push({ label: referenceLine.label, query: (pivotTable?.rows ? pivotTable.rows : item.rows).map((row) => Number(row[referenceLine.label]) || 0) });
+                referenceLineYValues.push({
+                    label: referenceLine.label,
+                    query: (pivotTable?.rows ? pivotTable.rows : item.rows).map((row) => Number(row[referenceLine.label]) || 0),
+                });
             }
         }
     }
@@ -128,6 +142,7 @@ async function cleanDashboardItem({ item, dashboardFilters, client, dateBucket,
         id: item._id ?? item.id,
         name: item.name,
         dashboardName: item.dashboardName,
+        section: item.section,
         rows: item.rows,
         pivotRows: pivotTable ? pivotTable.rows : undefined,
         pivotColumns: pivotTable ? pivotTable.columns : undefined,

package/dist/cjs/utils/dataFetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAgFvD,wBAAsB,OAAO,CAC3B,MAAM,EAAE,mBAAmB,EAC3B,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,WAAW,gBA4K1B;AAED,wBAAgB,aAAa;+BAGjB,mBAAmB,sBACP,MAAM,oBACR,GAAG,iCAEP,WAAW;EAoC5B;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,mBAAmB,EAC3B,QAAQ,CAAC,EAAE,GAAG,GACb,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAmB5C"}
+{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAgFvD,wBAAsB,OAAO,CAC3B,MAAM,EAAE,mBAAmB,EAC3B,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,WAAW,gBAgL1B;AAED,wBAAgB,aAAa;+BAGjB,mBAAmB,sBACP,MAAM,oBACR,GAAG,iCAEP,WAAW;EAoC5B;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,mBAAmB,EAC3B,QAAQ,CAAC,EAAE,GAAG,GACb,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAmB5C"}

package/dist/cjs/utils/dataFetcher.js

@@ -88,11 +88,12 @@ async function getData(client, cloudQueryEndpoint, noCred, hostedRequestBody, cl
                 signal: abortSignal,
             });
             const responseJson = await resp.json();
-            if (responseJson.status === 'error' &&
-                ['query', 'patterns', 'item'].includes(hostedRequestBody.metadata.task)) {
+            if ((responseJson.status === 'error' || responseJson.data.error) &&
+                ['query', 'patterns', 'item', 'report'].includes(hostedRequestBody.metadata.task)) {
                 const brokenReport = { ...responseJson };
                 let errorPrefix = 'Error: ';
-                let errorMessage = 'Failed to fetch report: ' + responseJson.error;
+                let errorMessage = 'Failed to fetch report: ' +
+                    (responseJson.error || responseJson.data.error);
                 if (hostedRequestBody.metadata.task === 'query' ||
                     hostedRequestBody.metadata.task === 'patterns') {
                     errorPrefix = responseJson.error?.includes('Query Parsing Error')

package/dist/cjs/utils/filterProcessing.d.ts

@@ -1,6 +1,7 @@
 import { FieldType, InternalFilter, DashboardDateFilter, Filter, DashboardFilter } from '../models/Filter';
 import { QuillReport } from '../models/Report';
 import { FilterTreeNode } from './astFilterProcessing';
+import { ReportBuilderState } from '../models/ReportBuilder';
 export declare function findAndProcessDateFilter(filters: any[]): any;
 export declare function processFilterFromBackend(filter: any): any;
 export declare function updateFilter(filter: any, value: any | undefined, comparison: any | undefined, dashboardName: string): any;
@@ -21,7 +22,7 @@ export declare function filterStackToFilterTree(stack: any[]): FilterTreeNode |
 /**
  * This function uses the baseAst and forms a SQL query using the a filters array
  */
-export declare function buildQueryFromFilters(baseAst: any, filters: FilterTreeNode[], endpoint: string, client: any): Promise<{
+export declare function buildQueryFromFilters(reportBuilderState: ReportBuilderState, filters: FilterTreeNode[], endpoint: string, client: any): Promise<{
     success: boolean;
     query?: string;
     error?: string;
@@ -29,16 +30,6 @@ export declare function buildQueryFromFilters(baseAst: any, filters: FilterTreeN
 export declare function applyCustomFilterToDashDateFilter(customDateFilter: Filter, dashboardDateFilter: DashboardDateFilter): DashboardDateFilter;
 export declare function mergeCustomFilters(filters: DashboardFilter[], customFilters: InternalFilter[]): any[];
 export declare function filtersAreEquivalent(filters1?: InternalFilter[], filters2?: InternalFilter[]): boolean;
-/**
- * Helper function that converts a UniqueValuesByColumn interface to a string map
- */
-export declare function uniqueValuesToStringMap(uniqueValues: {
-    [column: string]: {
-        [value: string]: boolean;
-    };
-}): {
-    [key: string]: string[];
-};
 export declare const createDefaultDateFilter: (filter: DashboardDateFilter, reports: QuillReport[], dashboardName: string) => (DashboardDateFilter & {
     dateField: string[];
 }) | undefined;

package/dist/cjs/utils/filterProcessing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,SAAS,EACT,cAAc,EAGd,mBAAmB,EACnB,MAAM,EAEN,eAAe,EAEhB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAmB,MAAM,uBAAuB,CAAC;AAGxE,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAoB5D;AAMD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,GAAG,OAkBnD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,GAAG,EACX,KAAK,EAAE,GAAG,YAAO,EACjB,UAAU,EAAE,GAAG,YAAO,EACtB,aAAa,EAAE,MAAM,OAmGtB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,cA0DhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAwB7D;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,GAAG,GAAG,cAAc,EAAE,CAoCrE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,yBAgCnD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,cAAc,EAAE,EACzB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA4B/D;AAED,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,mBAAmB,GACvC,mBAAmB,CAkKrB;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,eAAe,EAAE,EAC1B,aAAa,EAAE,cAAc,EAAE,GAC9B,GAAG,EAAE,CA+CP;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,cAAc,EAAE,EAC3B,QAAQ,CAAC,EAAE,cAAc,EAAE,GAC1B,OAAO,CA+BT;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE;IACpD,CAAC,MAAM,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;CAChD,GAAG;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB,CASA;AAED,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,WAClB,WAAW,EAAE,iBACP,MAAM,KACpB,CAAC,mBAAmB,GAAG;IAAE,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GAAG,SAqDpD,CAAC"}
+{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,SAAS,EACT,cAAc,EAGd,mBAAmB,EACnB,MAAM,EAEN,eAAe,EAEhB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAmB,MAAM,uBAAuB,CAAC;AAExE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAG7D,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAoB5D;AAMD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,GAAG,OAkBnD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,GAAG,EACX,KAAK,EAAE,GAAG,YAAO,EACjB,UAAU,EAAE,GAAG,YAAO,EACtB,aAAa,EAAE,MAAM,OAmGtB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,cA0DhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAwB7D;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,GAAG,GAAG,cAAc,EAAE,CAoCrE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,yBAgCnD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,kBAAkB,EAAE,kBAAkB,EACtC,OAAO,EAAE,cAAc,EAAE,EACzB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiC/D;AAED,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,mBAAmB,GACvC,mBAAmB,CAkKrB;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,eAAe,EAAE,EAC1B,aAAa,EAAE,cAAc,EAAE,GAC9B,GAAG,EAAE,CA+CP;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,cAAc,EAAE,EAC3B,QAAQ,CAAC,EAAE,cAAc,EAAE,GAC1B,OAAO,CA+BT;AAED,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,WAClB,WAAW,EAAE,iBACP,MAAM,KACpB,CAAC,mBAAmB,GAAG;IAAE,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GAAG,SAqDpD,CAAC"}

package/dist/cjs/utils/filterProcessing.js

@@ -11,12 +11,12 @@ exports.buildQueryFromFilters = buildQueryFromFilters;
 exports.applyCustomFilterToDashDateFilter = applyCustomFilterToDashDateFilter;
 exports.mergeCustomFilters = mergeCustomFilters;
 exports.filtersAreEquivalent = filtersAreEquivalent;
-exports.uniqueValuesToStringMap = uniqueValuesToStringMap;
 const date_fns_1 = require("date-fns");
 const dateRangePickerUtils_1 = require("../DateRangePicker/dateRangePickerUtils");
 const Filter_1 = require("../models/Filter");
 const astFilterProcessing_1 = require("./astFilterProcessing");
 const textProcessing_1 = require("./textProcessing");
+const reportBuilder_1 = require("./reportBuilder");
 function findAndProcessDateFilter(filters) {
     let dateFilter = filters.find((filter) => filter.filterType === 'date_range');
     if (dateFilter) {
@@ -321,13 +321,14 @@ function filterStackToFilterTree(stack) {
 /**
  * This function uses the baseAst and forms a SQL query using the a filters array
  */
-async function buildQueryFromFilters(baseAst, filters, endpoint, client) {
+async function buildQueryFromFilters(reportBuilderState, filters, endpoint, client) {
     const subTree = filterStackToFilterTree(filters);
     let whereNode = null;
     if (subTree) {
         whereNode = (0, astFilterProcessing_1.filterTreeToAst)(subTree, client.databaseType.toLowerCase());
     }
-    const queryAst = { ...baseAst, where: whereNode };
+    const ast = (0, reportBuilder_1.reportBuilderStateToAst)({ ...reportBuilderState, filterStack: filters }, client.databaseType.toLowerCase());
+    const queryAst = { ...ast, where: whereNode };
     try {
         const response = await fetch(`${endpoint}/sqlify`, {
             method: 'POST',
@@ -554,19 +555,6 @@ function filtersAreEquivalent(filters1, filters2) {
     }
     return true;
 }
-/**
- * Helper function that converts a UniqueValuesByColumn interface to a string map
- */
-function uniqueValuesToStringMap(uniqueValues) {
-    const fieldValues = {};
-    for (const field of Object.keys(uniqueValues)) {
-        fieldValues[field] = [];
-        for (const value of Object.keys(uniqueValues[field] ?? {})) {
-            fieldValues[field].push(value);
-        }
-    }
-    return fieldValues;
-}
 const createDefaultDateFilter = (filter, reports, dashboardName) => {
     const comparisonRangeStart = getComparisonRange(filter, 'startDate');
     const comparisonRangeEnd = getComparisonRange(filter, 'endDate');

package/dist/cjs/utils/pivotConstructor.d.ts

@@ -2,7 +2,7 @@ import { QuillProviderClient } from '../models/Client';
 import { Pivot, PivotData } from '../models/Pivot';
 import { QuillReportInternal } from '../models/Report';
 import { AdditionalProcessing } from './tableProcessing';
-export declare function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFilter, distinctStrings, dashboardName, tenants, additionalProcessing, pivotQuery, comparisonPivotQuery, getPivotRowCount, }: {
+export declare function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFilter, distinctStrings, dashboardName, tenants, additionalProcessing, pivotQuery, comparisonPivotQuery, getPivotRowCount, caller, }: {
     pivot: Pivot;
     report?: QuillReportInternal;
     client: QuillProviderClient;
@@ -18,6 +18,7 @@ export declare function generatePivotWithSQL({ pivot, report, client, dateBucket
     pivotQuery?: string;
     comparisonPivotQuery?: string;
     getPivotRowCount?: boolean;
+    caller?: string;
 }): Promise<PivotData>;
 export declare function disambiguatedValueField(pivot: Pivot): string | undefined;
 //# sourceMappingURL=pivotConstructor.d.ts.map

package/dist/cjs/utils/pivotConstructor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAYvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAsB,oBAAoB,CAAC,EACzC,KAAK,EACL,MAAM,EACN,MAAM,EACN,UAAU,EACV,UAAU,EACV,eAAe,EACf,aAAa,EACb,OAAO,EACP,oBAAoB,EACpB,UAAU,EACV,oBAAoB,EACpB,gBAAuB,GACxB,EAAE;IACD,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EACJ;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GAAG,OAAO,CAAC,SAAS,CAAC,CAuWrB;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,sBAYnD"}
+{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAYvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAsB,oBAAoB,CAAC,EACzC,KAAK,EACL,MAAM,EACN,MAAM,EACN,UAAU,EACV,UAAU,EACV,eAAe,EACf,aAAa,EACb,OAAO,EACP,oBAAoB,EACpB,UAAU,EACV,oBAAoB,EACpB,gBAAuB,EACvB,MAAM,GACP,EAAE;IACD,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EACJ;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,SAAS,CAAC,CAyWrB;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,sBAYnD"}

package/dist/cjs/utils/pivotConstructor.js

@@ -11,7 +11,7 @@ const dates_1 = require("./dates");
 const merge_1 = require("./merge");
 const queryConstructor_1 = require("./queryConstructor");
 const textProcessing_1 = require("./textProcessing");
-async function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFilter, distinctStrings, dashboardName, tenants, additionalProcessing, pivotQuery, comparisonPivotQuery, getPivotRowCount = true, }) {
+async function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFilter, distinctStrings, dashboardName, tenants, additionalProcessing, pivotQuery, comparisonPivotQuery, getPivotRowCount = true, caller, }) {
     let sqlQuery = pivotQuery;
     let comparisonPivotSql = comparisonPivotQuery;
     const databaseType = client.databaseType || 'postgresql';
@@ -76,7 +76,9 @@ async function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFil
         ? (0, queryConstructor_1.additionalProcessingOnPivotQuery)(pivot, comparisonPivotSql, additionalProcessing, client.databaseType)
         : '';
     const preQueries = [paginatedSqlQuery];
-    getPivotRowCount = getPivotRowCount && report?.chartType === 'table';
+    getPivotRowCount =
+        getPivotRowCount &&
+            (report?.chartType === 'table' || caller === 'ReportBuilder');
     if (getPivotRowCount) {
         const pivotRowCountQuery = (0, queryConstructor_1.generateRowCountQuery)(sqlQuery, client.databaseType);
         preQueries.push(pivotRowCountQuery);

package/dist/cjs/utils/pivotProcessing.d.ts

@@ -1,15 +1,13 @@
+import { AxisFormat } from '../Dashboard';
 import { ColumnInternal } from '../models/Columns';
-import { Pivot } from '../models/Pivot';
-export declare function pivotToSql(pivot: Pivot, query: string, columns: ColumnInternal[]): string;
+import { Pivot, PivotData } from '../models/Pivot';
+import { QuillReportInternal } from '../models/Report';
+import { UniqueValuesByColumn } from '../models/Tables';
 export declare function isValidPivot(pivot: Pivot): {
     valid: boolean;
     reason: string;
 };
-export declare function getPossiblePivotFieldOptions(columns: ColumnInternal[], uniqueValues: {
-    [column: string]: {
-        [value: string]: boolean;
-    };
-}): {
+export declare function getPossiblePivotFieldOptions(columns: ColumnInternal[], uniqueValues: UniqueValuesByColumn): {
     rowFields: string[];
     columnFields: string[];
     valueFields: string[];
@@ -20,4 +18,16 @@ export declare function cleanPivot(pivot: Pivot, possibleColumns: {
     valueFields: any;
 }): Pivot;
 export declare const isPivotPossible: (fields: any, pivot: Pivot) => boolean;
+export declare const pivotFormData: (pivot: Pivot, columns: ColumnInternal[], report?: QuillReportInternal, formChartType?: string, pivotData?: PivotData) => {
+    pivot: Pivot;
+    chartType: string;
+    xAxisField: string | undefined;
+    xAxisFormat: AxisFormat;
+    xAxisLabel: string | undefined;
+    yAxisFields: {
+        field: string;
+        label: string;
+        format: AxisFormat;
+    }[];
+};
 //# sourceMappingURL=pivotProcessing.d.ts.map

package/dist/cjs/utils/pivotProcessing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAIxC,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EAAE,GACxB,MAAM,CAuCR;AAkBD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAmB7E;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,EAAE;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAA;CAAE;;;;EAsDjE;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,eAAe,EAAE;IACf,SAAS,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,EAAE,GAAG,CAAC;CAClB,GACA,KAAK,CAoCP;AAED,eAAO,MAAM,eAAe,WAAY,GAAG,SAAS,KAAK,YA8BxD,CAAC"}
+{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAMxD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAuB7E;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,EAAE,oBAAoB;;;;EAyDnC;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,eAAe,EAAE;IACf,SAAS,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,EAAE,GAAG,CAAC;CAClB,GACA,KAAK,CAsCP;AAED,eAAO,MAAM,eAAe,WAAY,GAAG,SAAS,KAAK,YA8BxD,CAAC;AAEF,eAAO,MAAM,aAAa,UACjB,KAAK,WACH,cAAc,EAAE,WAChB,mBAAmB,kBACZ,MAAM,cACV,SAAS;;;;;;;;;;;CAuDtB,CAAC"}

package/dist/cjs/utils/pivotProcessing.js

@@ -1,56 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPivotPossible = void 0;
-exports.pivotToSql = pivotToSql;
+exports.pivotFormData = exports.isPivotPossible = void 0;
 exports.isValidPivot = isValidPivot;
 exports.getPossiblePivotFieldOptions = getPossiblePivotFieldOptions;
 exports.cleanPivot = cleanPivot;
 const util_1 = require("../components/ReportBuilder/util");
+const PivotModal_1 = require("../internals/ReportBuilder/PivotModal");
+const columnProcessing_1 = require("./columnProcessing");
 const constants_1 = require("./constants");
+const pivotConstructor_1 = require("./pivotConstructor");
 const valueFormatter_1 = require("./valueFormatter");
-function pivotToSql(pivot, query, columns) {
-    const processedAggType = pivot.aggregationType?.toLowerCase() === 'average'
-        ? 'avg'
-        : pivot.aggregationType?.toLowerCase();
-    if ((!pivot.rowField && pivot.valueField && processedAggType) ||
-        (!pivot.valueField && pivot.rowField && processedAggType === 'count')) {
-        // table aggregation
-        return `with
-    original_query as (${query})
-    SELECT ${processedAggType}(${pivot.valueField ?? pivot.rowField}) FROM original_query`;
-    }
-    else if (!pivot.columnField &&
-        processedAggType &&
-        pivot.rowField &&
-        pivot.valueField) {
-        // 1-d pivot
-        return `with
-    original_query as (${query})
-    SELECT ${pivot.rowField}, ${processedAggType}(${pivot.valueField}) FROM original_query GROUP BY ${pivot.rowField}`;
-    }
-    else if (pivot.columnField &&
-        pivot.rowField &&
-        pivot.valueField &&
-        processedAggType) {
-        // 2-d pivot
-        const sqlQuery = generateTwoDPivotQuery(
-        // @ts-ignore
-        { ...pivot, aggregationType: processedAggType }, query, columns);
-        return sqlQuery;
-    }
-    return query;
-}
-function generateTwoDPivotQuery(pivot, query, columns) {
-    const caseWhens = columns.map((column) => {
-        return `${pivot.aggregationType}(
-      CASE WHEN ${pivot.columnField} = '${column.field}' THEN ${pivot.valueField} ELSE 0 END
-    ) AS "${column.field}"`;
-    });
-    return `WITH
-    original_query as (${query})
-  SELECT ${pivot.rowField}, ${caseWhens.join(', ')}
-  FROM original_query GROUP BY ${pivot.rowField}`;
-}
 function isValidPivot(pivot) {
     if (!pivot.rowField && !pivot.aggregations?.[0]?.valueField) {
         return {
@@ -87,14 +46,14 @@ function getPossiblePivotFieldOptions(columns, uniqueValues) {
         // }
         // column fields can be strings
         if (column.jsType === 'string') {
-            const possibleValues = uniqueValues ? uniqueValues[column.field] : 0;
+            const possibleValues = uniqueValues?.[column.field] ?? [];
             const isNullValuesOnly = !possibleValues ||
                 (Object.keys(possibleValues).length === 1 &&
                     Object.keys(possibleValues)[0] === 'null');
             if (!isNullValuesOnly &&
-                Object.keys(possibleValues).length <= constants_1.MAX_PIVOT_UNIQUE_VALUES &&
+                possibleValues.length <= constants_1.MAX_PIVOT_UNIQUE_VALUES &&
                 !(Object.keys(possibleValues).length === 1 &&
-                    possibleValues['EXCEEDS_LIMIT'] !== undefined)) {
+                    possibleValues[0] === 'EXCEEDS_LIMIT')) {
                 columnFields.push(column.field);
             }
             if (!isNullValuesOnly // Used to limit rowFields with max unique values, no more
@@ -104,7 +63,8 @@ function getPossiblePivotFieldOptions(columns, uniqueValues) {
         }
         // value fields can be numbers or bools
         // TODO: should "format" be used as the indicator, or fieldType?
-        if (valueFormatter_1.NUMBER_FORMAT_TYPES.includes(column.format) || column.jsType === 'bool') {
+        if (valueFormatter_1.NUMBER_FORMAT_TYPES.includes(column.format) ||
+            column.jsType === 'bool') {
             if (!(0, util_1.isIdColumn)(column.field)) {
                 valueFields.push(column.field);
             }
@@ -140,10 +100,12 @@ function cleanPivot(pivot, possibleColumns) {
         pivot.columnField = undefined;
     }
     if (pivot.aggregationType) {
-        pivot.aggregations = [{
+        pivot.aggregations = [
+            {
                 valueField: pivot.valueField,
                 aggregationType: pivot.aggregationType,
-            }];
+            },
+        ];
     }
     return pivot;
 }
@@ -164,3 +126,50 @@ const isPivotPossible = (fields, pivot) => {
     return validPivot;
 };
 exports.isPivotPossible = isPivotPossible;
+const pivotFormData = (pivot, columns, report, formChartType, pivotData) => {
+    const yAxisField = pivot.columnField ?? (0, pivotConstructor_1.disambiguatedValueField)(pivot) ?? '';
+    const yAxisLabel = report?.yAxisFields && report?.yAxisFields?.length > 0
+        ? (report.yAxisFields[0]?.label ?? '')
+        : ((0, pivotConstructor_1.disambiguatedValueField)(pivot) ?? '');
+    // date labels for pivots should be treated like strings since they are
+    const yAxisIsDate = pivot.columnField
+        ? (0, PivotModal_1.isDateField)(pivot.columnFieldType ?? '')
+        : false;
+    const chartType = formChartType ?? (pivot.rowField ? 'column' : 'metric');
+    const rowColumn = (pivotData?.columns ?? columns).find((col) => col.field === pivot.rowField);
+    const xAxisField = pivot.rowField &&
+        !(['metric', 'gauge'].includes(chartType) &&
+            !valueFormatter_1.NUMBER_FORMAT_TYPES.includes(rowColumn?.format ?? ''))
+        ? pivot.rowField
+        : (0, pivotConstructor_1.disambiguatedValueField)(pivot);
+    const result = {
+        pivot,
+        chartType: chartType,
+        xAxisField,
+        xAxisFormat: chartType === 'gauge'
+            ? 'percent'
+            : chartType === 'metric'
+                ? 'whole_number'
+                : (0, columnProcessing_1.isDateType)(pivot.rowFieldType ?? '')
+                    ? 'string'
+                    : (0, columnProcessing_1.isNumberType)(pivot.rowFieldType ?? '')
+                        ? 'whole_number'
+                        : (0, columnProcessing_1.isNumberType)((0, pivotConstructor_1.disambiguatedValueField)(pivot) ?? '')
+                            ? 'whole_number'
+                            : 'string',
+        xAxisLabel: report?.xAxisLabel || pivot.rowField,
+        yAxisFields: [
+            {
+                field: yAxisField,
+                label: yAxisLabel,
+                format: yAxisIsDate
+                    ? 'string'
+                    : report?.yAxisFields && report?.yAxisFields?.length > 0
+                        ? (report?.yAxisFields[0]?.format ?? 'whole_number')
+                        : (report?.columns.find((col) => col.field === (0, pivotConstructor_1.disambiguatedValueField)(pivot))?.format ?? 'whole_number'),
+            },
+        ],
+    };
+    return result;
+};
+exports.pivotFormData = pivotFormData;

package/dist/cjs/utils/queryConstructor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAIxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAStE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,UAAQ,UAGrE;AAMD,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,kBAAkB,CAAC,EAAE,OAAO,EAC5B,iBAAiB,CAAC,EAAE,OAAO,UAkG5B;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAmBD,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,UA8B5B;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,UAYnB;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAsBrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAcrB;AAmFD,wBAAgB,8BAA8B,CAC5C,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAkBrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAkBpB;AA82BD,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,KAAK,EACZ,KAAK,CAAC,EAAE,MAAM,EACd,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,YAAY,SAAe,sBAuE5B;AAED,wBAAgB,qBAAqB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,sBAqB1E"}
+{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAIxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAStE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,UAAQ,UAGrE;AAMD,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,kBAAkB,CAAC,EAAE,OAAO,EAC5B,iBAAiB,CAAC,EAAE,OAAO,UAkG5B;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAmBD,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,UA8B5B;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,UAYnB;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAsBrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAiBrB;AAgGD,wBAAgB,8BAA8B,CAC5C,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAkBrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAkBpB;AA82BD,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,KAAK,EACZ,KAAK,CAAC,EAAE,MAAM,EACd,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,YAAY,SAAe,sBAuE5B;AAED,wBAAgB,qBAAqB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,sBAqB1E"}

package/dist/cjs/utils/queryConstructor.js

@@ -197,12 +197,15 @@ function generateDistinctQuery(stringFields, query, databaseType) {
     switch (databaseType.toLowerCase()) {
         case 'mysql':
             return generateDistinctQueryMySQL(stringFields, query);
+        case 'bigquery':
+            return generateDistinctQueryBigQuery(stringFields, query);
         case 'postgresql':
             return generateDistinctQueryPostgres(stringFields, query);
         case 'snowflake':
             return generateDistinctQuerySnowflake(stringFields, query);
         case 'mssql':
             return generateDistinctQueryMSSQL(stringFields, query);
+        case 'clickhouse': // works with default for now
         default:
             return generateDistinctQueryDefault(stringFields, query, databaseType);
     }
@@ -224,6 +227,16 @@ function generateDistinctQueryMySQL(stringFields, query) {
     const distinctQuery = distinctQueries.join(' UNION ALL ');
     return `WITH querytable AS (${query.replace(';', '')}) ` + distinctQuery;
 }
+function generateDistinctQueryBigQuery(stringFields, query) {
+    const distinctQueries = stringFields.map((field) => {
+        return `
+      SELECT '${field}' AS ${processColumnReference('field', 'bigquery')}, 
+             ARRAY_AGG(\`${field}\`) AS ${processColumnReference('string_values', 'bigquery')}
+      FROM (SELECT \`${field}\` FROM querytable WHERE \`${field}\` IS NOT NULL GROUP BY \`${field}\`) AS distinct_${replaceSpacesWithUnderscores(field)}`;
+    });
+    const distinctQuery = distinctQueries.join(' UNION ALL ');
+    return `WITH querytable AS (${query.replace(';', '')}) ` + distinctQuery;
+}
 function generateDistinctQueryPostgres(stringFields, query) {
     const distinctQueries = stringFields.map((field) => {
         return `SELECT '${field}' AS ${processColumnReference('field', 'postgresql')}, to_json(ARRAY_AGG(DISTINCT "${field}")) AS ${processColumnReference('string_values', 'postgresql')} FROM querytable`;
@@ -363,7 +376,7 @@ function create2DStringPivotQuery(pivot, itemQuery, columnFieldValues, databaseT
                     ...caseWhens,
                     ...columnFieldValues.map((column) => {
                         return `sum(CASE WHEN ${columnFieldAlias} = '${processSingleQuotes(column, databaseType)}' THEN ${valueExpr} END) / GREATEST(sum(${value2Expr}), 1) AS ${processColumnReference(column + disambiguation, databaseType, '_', true)}`;
-                    })
+                    }),
                 ];
             }
             else {
@@ -372,7 +385,7 @@ function create2DStringPivotQuery(pivot, itemQuery, columnFieldValues, databaseT
                     ...caseWhens,
                     ...columnFieldValues.map((column) => {
                         return `sum(CASE WHEN ${columnFieldAlias} = '${processSingleQuotes(column, databaseType)}' THEN ${valueExpr} END) / GREATEST(sum(CASE WHEN ${columnFieldAlias} = '${processSingleQuotes(column, databaseType)}' THEN ${value2Expr} END), 1) AS ${processColumnReference(column + disambiguation, databaseType, '_', true)}`;
-                    })
+                    }),
                 ];
             }
         }