@quillsql/react 2.16.69 → 2.16.71

package/dist/index.cjs

@@ -17307,10 +17307,15 @@ async function generatePivotWithSQL({
   const queryResponseFields = resp.data?.fields || resp.queries?.queryResults?.[0]?.fields || [];
   const rowCount = resp.queries?.queryResults?.[1]?.rows?.[0]?.row_count || 0;
   parseValueFromBigQueryDates(queryResponseRows, queryResponseFields);
+  const resultRowField = processColumnName(
+    String(
+      resp.data?.config?.rowField ?? pivot.rowField ?? ""
+    )
+  );
   const responseRows = queryResponseRows;
   const responseFields = queryResponseFields;
-  const rows = pivot.rowField ? responseRows.map(
-    (row) => !row[pivot.rowField] ? { ...row, [pivot.rowField]: "-" } : row
+  const rows = resultRowField ? responseRows.map(
+    (row) => !row[resultRowField] ? { ...row, [resultRowField]: "-" } : row
   ) : responseRows;
   if (pivot.columnField && client.databaseType?.toLowerCase() === "bigquery") {
     rows.forEach((row) => {
@@ -17330,27 +17335,27 @@ async function generatePivotWithSQL({
         (field.field || field.name).replace("comparison_", "comparison ")
       )
     ),
-    format: (field.field || field.name) === pivot.rowField ? "string" : pivot.aggregations?.find(
+    format: processColumnName(field.field || field.name) === resultRowField ? "string" : pivot.aggregations?.find(
       (agg) => agg.valueField === (field.field || field.name) || `${agg.valueField}_percentage` === (field.field || field.name) || !agg.valueField && agg.aggregationType === "percentage" && (field.field || field.name)?.endsWith("percentage")
     )?.aggregationType === "percentage" ? "percent" : "whole_number",
     fieldType: field.fieldType,
     jsType: field.jsType,
     dataTypeID: field.dataTypeID
   })).filter(
-    (field, index) => field.field !== "comparison_" + pivot.rowField || index === 0
+    (field, index) => field.field !== "comparison_" + resultRowField || index === 0
   ).sort((a, b) => {
-    if (a.field === pivot.rowField) {
+    if (a.field === resultRowField) {
       return -1;
     }
-    if (b.field === pivot.rowField) {
+    if (b.field === resultRowField) {
       return 1;
     }
     return 0;
   });
-  if (pivot.rowField && !isStringType(pivot.rowFieldType || "")) {
+  if (resultRowField && !isStringType(pivot.rowFieldType || "")) {
     rows.forEach((row) => {
-      row.__quillRawDate = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
-      let value = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
+      row.__quillRawDate = typeof row[resultRowField] === "object" ? row[resultRowField].value : row[resultRowField];
+      let value = typeof row[resultRowField] === "object" ? row[resultRowField].value : row[resultRowField];
       if (dateBucket === "week" && dateFilter?.startDate && dateFilter?.endDate) {
         const rowDate = new Date(value);
         if (rowDate < dateFilter.startDate) {
@@ -17365,12 +17370,10 @@ async function generatePivotWithSQL({
         dateBucket,
         databaseType
       );
-      row[pivot.rowField || ""] = dateString;
+      row[resultRowField] = dateString;
     });
-    if (pivot.rowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
-      const dateSet = new Set(
-        rows.map((row) => row[pivot.rowField || ""])
-      );
+    if (resultRowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
+      const dateSet = new Set(rows.map((row) => row[resultRowField]));
       for (let date = dateFilter.startDate; date <= dateFilter.endDate; date = new Date(date.getTime() + 24 * 60 * 60 * 1e3)) {
         const formattedDate = getDateString(
           date.toISOString(),
@@ -17380,7 +17383,7 @@ async function generatePivotWithSQL({
         );
         if (!dateSet.has(formattedDate)) {
           const newRow = {};
-          newRow[pivot.rowField] = formattedDate;
+          newRow[resultRowField] = formattedDate;
           newRow.__quillRawDate = date.toISOString();
           rows.push(newRow);
           dateSet.add(formattedDate);
@@ -17417,6 +17420,7 @@ async function generatePivotWithSQL({
     rows,
     columns: columns ?? [],
     rowCount: rowCount || rows.length,
+    rowField: resultRowField || void 0,
     pivotQuery: report?.queryString || "",
     comparisonPivotQuery: comparisonPivotQuery || ""
   };
@@ -17516,14 +17520,18 @@ function processPivotData({
   rows: responseRows,
   fields: responseFields,
   pivot,
+  resultRowField,
   dateBucket,
   dateFilter,
   client,
   rowCount
 }) {
   const databaseType = client.databaseType || "postgresql";
-  const rows = pivot.rowField ? responseRows.map(
-    (row) => !row[pivot.rowField] ? { ...row, [pivot.rowField]: "-" } : row
+  const pivotRowField = processColumnName(
+    String(resultRowField ?? pivot.rowField ?? "")
+  );
+  const rows = pivotRowField ? responseRows.map(
+    (row) => !row[pivotRowField] ? { ...row, [pivotRowField]: "-" } : row
   ) : responseRows;
   if (pivot.columnField && client.databaseType?.toLowerCase() === "bigquery") {
     rows.forEach((row) => {
@@ -17543,27 +17551,27 @@ function processPivotData({
         (field.field || field.name).replace("comparison_", "comparison ")
       )
     ),
-    format: (field.field || field.name) === pivot.rowField ? "string" : pivot.aggregations?.find(
+    format: processColumnName(field.field || field.name) === pivotRowField ? "string" : pivot.aggregations?.find(
       (agg) => agg.valueField === (field.field || field.name) || `${agg.valueField}_percentage` === (field.field || field.name) || !agg.valueField && agg.aggregationType === "percentage" && (field.field || field.name)?.endsWith("percentage")
     )?.aggregationType === "percentage" ? "percent" : "whole_number",
     fieldType: field.fieldType,
     jsType: field.jsType,
     dataTypeID: field.dataTypeID
   })).filter(
-    (field, index) => field.field !== "comparison_" + pivot.rowField || index === 0
+    (field, index) => field.field !== "comparison_" + pivotRowField || index === 0
   ).sort((a, b) => {
-    if (a.field === pivot.rowField) {
+    if (a.field === pivotRowField) {
       return -1;
     }
-    if (b.field === pivot.rowField) {
+    if (b.field === pivotRowField) {
       return 1;
     }
     return 0;
   });
-  if (pivot.rowField && !isStringType(pivot.rowFieldType || "")) {
+  if (pivotRowField && !isStringType(pivot.rowFieldType || "")) {
     rows.forEach((row) => {
-      row.__quillRawDate = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
-      let value = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
+      row.__quillRawDate = typeof row[pivotRowField] === "object" ? row[pivotRowField].value : row[pivotRowField];
+      let value = typeof row[pivotRowField] === "object" ? row[pivotRowField].value : row[pivotRowField];
       if (dateBucket === "week" && dateFilter?.startDate && dateFilter?.endDate) {
         const rowDate = new Date(value);
         if (rowDate < dateFilter.startDate) {
@@ -17578,12 +17586,10 @@ function processPivotData({
         dateBucket,
         databaseType
       );
-      row[pivot.rowField || ""] = dateString;
+      row[pivotRowField] = dateString;
     });
-    if (pivot.rowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
-      const dateSet = new Set(
-        rows.map((row) => row[pivot.rowField || ""])
-      );
+    if (pivotRowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
+      const dateSet = new Set(rows.map((row) => row[pivotRowField]));
       for (let date = dateFilter.startDate; date <= dateFilter.endDate; date = new Date(date.getTime() + 24 * 60 * 60 * 1e3)) {
         const formattedDate = getDateString(
           date.toISOString(),
@@ -17593,7 +17599,7 @@ function processPivotData({
         );
         if (!dateSet.has(formattedDate)) {
           const newRow = {};
-          newRow[pivot.rowField] = formattedDate;
+          newRow[pivotRowField] = formattedDate;
           newRow.__quillRawDate = date.toISOString();
           rows.push(newRow);
           dateSet.add(formattedDate);
@@ -17630,6 +17636,7 @@ function processPivotData({
     rows,
     columns: columns ?? [],
     rowCount: rowCount || rows.length,
+    rowField: pivotRowField || void 0,
     pivotQuery: "",
     comparisonPivotQuery: ""
   };
@@ -21989,12 +21996,14 @@ function buildPivotOnlyReportFromResponse({
   }
   let pivotRows = rawPivotRows;
   let pivotColumns = Array.isArray(response?.pivotColumns) ? response.pivotColumns : fallbackBaseReport.pivotColumns ?? [];
+  let pivotResultRowField;
   let pivotRowCount = typeof response?.pivotRowCount === "number" ? response.pivotRowCount : typeof response?.rowCount === "number" ? response.rowCount : rawPivotRows.length;
   if (effectivePivot && rawPivotFields.length > 0) {
     const pivotData = processPivotData({
       rows: rawPivotRows,
       fields: rawPivotFields,
       pivot: effectivePivot,
+      resultRowField: response?.config?.rowField,
       ...effectivePivot.dateBucket ? { dateBucket: effectivePivot.dateBucket } : {},
       client,
       rowCount: typeof response?.rowCount === "number" ? response.rowCount : void 0
@@ -22002,6 +22011,7 @@ function buildPivotOnlyReportFromResponse({
     pivotRows = pivotData.rows;
     pivotColumns = pivotData.columns;
     pivotRowCount = pivotData.rowCount;
+    pivotResultRowField = pivotData.rowField;
   }
   const pivotOnlyReport = {
     ...responseReport,
@@ -22013,7 +22023,9 @@ function buildPivotOnlyReportFromResponse({
     pivot: effectivePivot,
     pivotRows,
     pivotColumns,
-    pivotRowCount
+    pivotRowCount,
+    pivotResultRowField,
+    pivotResultSourceRowField: effectivePivot?.rowField
   };
   if (additionalProcessing) {
     pivotOnlyReport.pagination = additionalProcessing.page;
@@ -62080,6 +62092,12 @@ function mergeDisplayAndSourceForTableFormats(args) {
       for (const candidateKey of candidateKeys) {
         const candidates = sourceColumnsByKey.get(candidateKey) ?? [];
         if (candidates.length === 0) continue;
+        const exactFieldMatch = candidates.find(
+          (candidate) => String(candidate.field ?? "").trim() === candidateKey
+        );
+        if (exactFieldMatch) {
+          return exactFieldMatch;
+        }
         if (selection.table) {
           const tableMatch = candidates.find((candidate) => {
             return String(candidate.table ?? "").trim() === selection.table;
@@ -63160,6 +63178,8 @@ async function loadViaReportBuilderState({
       pivotRows: refreshedPivotData?.rows ?? compatibleReportPivotRows ?? (canReuseBasePivotRowsAndColumns ? baseReport.pivotRows : []) ?? [],
       pivotColumns: refreshedPivotData?.columns ?? compatibleReportPivotColumns ?? (canReuseBasePivotRowsAndColumns ? baseReport.pivotColumns : []) ?? [],
       pivotRowCount: refreshedPivotData?.rowCount ?? compatibleReportPivotRowCount ?? (canReuseBasePivotRowsAndColumns ? baseReport.pivotRowCount : void 0) ?? 0,
+      pivotResultRowField: refreshedPivotData?.rowField ?? reportBuilderInfo.report.pivotResultRowField ?? (canReuseBasePivotRowsAndColumns ? baseReport.pivotResultRowField : void 0),
+      pivotResultSourceRowField: refreshedPivotData?.rowField && requestedPivotRowField ? requestedPivotRowField : reportBuilderInfo.report.pivotResultSourceRowField ? reportBuilderInfo.report.pivotResultSourceRowField : canReuseBasePivotRowsAndColumns ? baseReport.pivotResultSourceRowField : void 0,
       uniqueStringsByTable: reportBuilderInfo.uniqueStringsByTable,
       uniqueStringsByColumn: reportBuilderInfo.uniqueStringsByColumn,
       columnUniqueValues: reportBuilderInfo.uniqueStringsByColumn,
@@ -64585,9 +64605,7 @@ function useReport(reportIdArg, options = {}) {
       reportId: effectiveReportId,
       draftSessionId,
       useInMemoryEngines,
-      hasInitialReportBuilderState: Boolean(
-        initialReportBuilderStateForLoad
-      ),
+      hasInitialReportBuilderState: Boolean(initialReportBuilderStateForLoad),
       reloadKeyHash,
       tenantHash,
       flagHash,
@@ -65410,11 +65428,7 @@ function useReport(reportIdArg, options = {}) {
       }
       return { ...currentReport, rowCount: countReport.rowCount };
     });
-  }, [
-    createdBootstrapRowCountQuery.data,
-    effectiveReportId,
-    sourceReport?.id
-  ]);
+  }, [createdBootstrapRowCountQuery.data, effectiveReportId, sourceReport?.id]);
   const chartTypes = (0, import_react61.useMemo)(() => {
     return getChartTypeOptions2({ pivot: pivotState });
   }, [pivotState]);
@@ -66199,6 +66213,8 @@ function useReport(reportIdArg, options = {}) {
           pivotRows: mergedPivotRows,
           pivotColumns: report.pivotColumns,
           pivotRowCount: mergedPivotRowCount,
+          pivotResultRowField: report.pivotResultRowField,
+          pivotResultSourceRowField: report.pivotResultSourceRowField,
           pivotQuery: report.pivotQuery,
           comparisonPivotQuery: report.comparisonPivotQuery,
           reportBuilderState: mergedReportBuilderState ? {
@@ -66218,7 +66234,11 @@ function useReport(reportIdArg, options = {}) {
   const chartData = (0, import_react61.useMemo)(() => {
     if (!sourceReport) return void 0;
     const rowsForChart = Array.isArray(sourceReport.rows) ? sourceReport.rows : [];
-    const chartPivotForDisplay = nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
+    const chartPivot = nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
+    const chartPivotForDisplay = chartPivot && sourceReport.pivotResultRowField && sourceReport.pivotResultSourceRowField === chartPivot.rowField ? {
+      ...chartPivot,
+      rowField: sourceReport.pivotResultRowField
+    } : chartPivot;
     const rowCountForChart = chartPivotForDisplay ? sourceReport.pivotRowCount ?? (Array.isArray(sourceReport.pivotRows) ? sourceReport.pivotRows.length : sourceReport.rowCount) : useInMemoryEngines ? rowsForChart.length : sourceReport.rowCount;
     const referencedTablesForChart = effectiveReportBuilderState?.tables.map((table2) => table2.name).filter((name2) => Boolean(name2));
     const pivotRowsForChart = Array.isArray(sourceReport.pivotRows) ? sourceReport.pivotRows : void 0;

package/dist/index.d.cts

@@ -620,6 +620,8 @@ type PivotData = {
     rows: any[];
     columns: ColumnInternal[];
     rowCount: number;
+    /** Row field name returned by the pivot query after backend disambiguation. */
+    rowField?: string;
     pivotQuery: string;
     comparisonPivotQuery?: string;
 };
@@ -791,6 +793,10 @@ interface QuillReport {
     pivotRows?: {
         [key: string]: string;
     }[];
+    /** Row field name returned by the pivot query after backend disambiguation. */
+    pivotResultRowField?: string;
+    /** Logical row field used to request pivotResultRowField. */
+    pivotResultSourceRowField?: string;
     /**
      * A list of metadata about the pivot yAxes of this report.
      */
@@ -3192,6 +3198,8 @@ declare function useReport(reportIdArg?: string, options?: UseReportOptions): {
         pivotRows?: {
             [key: string]: string;
         }[];
+        pivotResultRowField?: string;
+        pivotResultSourceRowField?: string;
         pivotColumns?: ColumnInternal[];
         pivotRowCount?: number;
     } | undefined;

package/dist/index.d.ts

@@ -620,6 +620,8 @@ type PivotData = {
     rows: any[];
     columns: ColumnInternal[];
     rowCount: number;
+    /** Row field name returned by the pivot query after backend disambiguation. */
+    rowField?: string;
     pivotQuery: string;
     comparisonPivotQuery?: string;
 };
@@ -791,6 +793,10 @@ interface QuillReport {
     pivotRows?: {
         [key: string]: string;
     }[];
+    /** Row field name returned by the pivot query after backend disambiguation. */
+    pivotResultRowField?: string;
+    /** Logical row field used to request pivotResultRowField. */
+    pivotResultSourceRowField?: string;
     /**
      * A list of metadata about the pivot yAxes of this report.
      */
@@ -3192,6 +3198,8 @@ declare function useReport(reportIdArg?: string, options?: UseReportOptions): {
         pivotRows?: {
             [key: string]: string;
         }[];
+        pivotResultRowField?: string;
+        pivotResultSourceRowField?: string;
         pivotColumns?: ColumnInternal[];
         pivotRowCount?: number;
     } | undefined;

package/dist/index.js

@@ -17353,10 +17353,15 @@ async function generatePivotWithSQL({
   const queryResponseFields = resp.data?.fields || resp.queries?.queryResults?.[0]?.fields || [];
   const rowCount = resp.queries?.queryResults?.[1]?.rows?.[0]?.row_count || 0;
   parseValueFromBigQueryDates(queryResponseRows, queryResponseFields);
+  const resultRowField = processColumnName(
+    String(
+      resp.data?.config?.rowField ?? pivot.rowField ?? ""
+    )
+  );
   const responseRows = queryResponseRows;
   const responseFields = queryResponseFields;
-  const rows = pivot.rowField ? responseRows.map(
-    (row) => !row[pivot.rowField] ? { ...row, [pivot.rowField]: "-" } : row
+  const rows = resultRowField ? responseRows.map(
+    (row) => !row[resultRowField] ? { ...row, [resultRowField]: "-" } : row
   ) : responseRows;
   if (pivot.columnField && client.databaseType?.toLowerCase() === "bigquery") {
     rows.forEach((row) => {
@@ -17376,27 +17381,27 @@ async function generatePivotWithSQL({
         (field.field || field.name).replace("comparison_", "comparison ")
       )
     ),
-    format: (field.field || field.name) === pivot.rowField ? "string" : pivot.aggregations?.find(
+    format: processColumnName(field.field || field.name) === resultRowField ? "string" : pivot.aggregations?.find(
       (agg) => agg.valueField === (field.field || field.name) || `${agg.valueField}_percentage` === (field.field || field.name) || !agg.valueField && agg.aggregationType === "percentage" && (field.field || field.name)?.endsWith("percentage")
     )?.aggregationType === "percentage" ? "percent" : "whole_number",
     fieldType: field.fieldType,
     jsType: field.jsType,
     dataTypeID: field.dataTypeID
   })).filter(
-    (field, index) => field.field !== "comparison_" + pivot.rowField || index === 0
+    (field, index) => field.field !== "comparison_" + resultRowField || index === 0
   ).sort((a, b) => {
-    if (a.field === pivot.rowField) {
+    if (a.field === resultRowField) {
       return -1;
     }
-    if (b.field === pivot.rowField) {
+    if (b.field === resultRowField) {
       return 1;
     }
     return 0;
   });
-  if (pivot.rowField && !isStringType(pivot.rowFieldType || "")) {
+  if (resultRowField && !isStringType(pivot.rowFieldType || "")) {
     rows.forEach((row) => {
-      row.__quillRawDate = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
-      let value = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
+      row.__quillRawDate = typeof row[resultRowField] === "object" ? row[resultRowField].value : row[resultRowField];
+      let value = typeof row[resultRowField] === "object" ? row[resultRowField].value : row[resultRowField];
       if (dateBucket === "week" && dateFilter?.startDate && dateFilter?.endDate) {
         const rowDate = new Date(value);
         if (rowDate < dateFilter.startDate) {
@@ -17411,12 +17416,10 @@ async function generatePivotWithSQL({
         dateBucket,
         databaseType
       );
-      row[pivot.rowField || ""] = dateString;
+      row[resultRowField] = dateString;
     });
-    if (pivot.rowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
-      const dateSet = new Set(
-        rows.map((row) => row[pivot.rowField || ""])
-      );
+    if (resultRowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
+      const dateSet = new Set(rows.map((row) => row[resultRowField]));
       for (let date = dateFilter.startDate; date <= dateFilter.endDate; date = new Date(date.getTime() + 24 * 60 * 60 * 1e3)) {
         const formattedDate = getDateString(
           date.toISOString(),
@@ -17426,7 +17429,7 @@ async function generatePivotWithSQL({
         );
         if (!dateSet.has(formattedDate)) {
           const newRow = {};
-          newRow[pivot.rowField] = formattedDate;
+          newRow[resultRowField] = formattedDate;
           newRow.__quillRawDate = date.toISOString();
           rows.push(newRow);
           dateSet.add(formattedDate);
@@ -17463,6 +17466,7 @@ async function generatePivotWithSQL({
     rows,
     columns: columns ?? [],
     rowCount: rowCount || rows.length,
+    rowField: resultRowField || void 0,
     pivotQuery: report?.queryString || "",
     comparisonPivotQuery: comparisonPivotQuery || ""
   };
@@ -17562,14 +17566,18 @@ function processPivotData({
   rows: responseRows,
   fields: responseFields,
   pivot,
+  resultRowField,
   dateBucket,
   dateFilter,
   client,
   rowCount
 }) {
   const databaseType = client.databaseType || "postgresql";
-  const rows = pivot.rowField ? responseRows.map(
-    (row) => !row[pivot.rowField] ? { ...row, [pivot.rowField]: "-" } : row
+  const pivotRowField = processColumnName(
+    String(resultRowField ?? pivot.rowField ?? "")
+  );
+  const rows = pivotRowField ? responseRows.map(
+    (row) => !row[pivotRowField] ? { ...row, [pivotRowField]: "-" } : row
   ) : responseRows;
   if (pivot.columnField && client.databaseType?.toLowerCase() === "bigquery") {
     rows.forEach((row) => {
@@ -17589,27 +17597,27 @@ function processPivotData({
         (field.field || field.name).replace("comparison_", "comparison ")
       )
     ),
-    format: (field.field || field.name) === pivot.rowField ? "string" : pivot.aggregations?.find(
+    format: processColumnName(field.field || field.name) === pivotRowField ? "string" : pivot.aggregations?.find(
       (agg) => agg.valueField === (field.field || field.name) || `${agg.valueField}_percentage` === (field.field || field.name) || !agg.valueField && agg.aggregationType === "percentage" && (field.field || field.name)?.endsWith("percentage")
     )?.aggregationType === "percentage" ? "percent" : "whole_number",
     fieldType: field.fieldType,
     jsType: field.jsType,
     dataTypeID: field.dataTypeID
   })).filter(
-    (field, index) => field.field !== "comparison_" + pivot.rowField || index === 0
+    (field, index) => field.field !== "comparison_" + pivotRowField || index === 0
   ).sort((a, b) => {
-    if (a.field === pivot.rowField) {
+    if (a.field === pivotRowField) {
       return -1;
     }
-    if (b.field === pivot.rowField) {
+    if (b.field === pivotRowField) {
       return 1;
     }
     return 0;
   });
-  if (pivot.rowField && !isStringType(pivot.rowFieldType || "")) {
+  if (pivotRowField && !isStringType(pivot.rowFieldType || "")) {
     rows.forEach((row) => {
-      row.__quillRawDate = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
-      let value = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
+      row.__quillRawDate = typeof row[pivotRowField] === "object" ? row[pivotRowField].value : row[pivotRowField];
+      let value = typeof row[pivotRowField] === "object" ? row[pivotRowField].value : row[pivotRowField];
       if (dateBucket === "week" && dateFilter?.startDate && dateFilter?.endDate) {
         const rowDate = new Date(value);
         if (rowDate < dateFilter.startDate) {
@@ -17624,12 +17632,10 @@ function processPivotData({
         dateBucket,
         databaseType
       );
-      row[pivot.rowField || ""] = dateString;
+      row[pivotRowField] = dateString;
     });
-    if (pivot.rowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
-      const dateSet = new Set(
-        rows.map((row) => row[pivot.rowField || ""])
-      );
+    if (pivotRowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
+      const dateSet = new Set(rows.map((row) => row[pivotRowField]));
       for (let date = dateFilter.startDate; date <= dateFilter.endDate; date = new Date(date.getTime() + 24 * 60 * 60 * 1e3)) {
         const formattedDate = getDateString(
           date.toISOString(),
@@ -17639,7 +17645,7 @@ function processPivotData({
         );
         if (!dateSet.has(formattedDate)) {
           const newRow = {};
-          newRow[pivot.rowField] = formattedDate;
+          newRow[pivotRowField] = formattedDate;
           newRow.__quillRawDate = date.toISOString();
           rows.push(newRow);
           dateSet.add(formattedDate);
@@ -17676,6 +17682,7 @@ function processPivotData({
     rows,
     columns: columns ?? [],
     rowCount: rowCount || rows.length,
+    rowField: pivotRowField || void 0,
     pivotQuery: "",
     comparisonPivotQuery: ""
   };
@@ -21986,12 +21993,14 @@ function buildPivotOnlyReportFromResponse({
   }
   let pivotRows = rawPivotRows;
   let pivotColumns = Array.isArray(response?.pivotColumns) ? response.pivotColumns : fallbackBaseReport.pivotColumns ?? [];
+  let pivotResultRowField;
   let pivotRowCount = typeof response?.pivotRowCount === "number" ? response.pivotRowCount : typeof response?.rowCount === "number" ? response.rowCount : rawPivotRows.length;
   if (effectivePivot && rawPivotFields.length > 0) {
     const pivotData = processPivotData({
       rows: rawPivotRows,
       fields: rawPivotFields,
       pivot: effectivePivot,
+      resultRowField: response?.config?.rowField,
       ...effectivePivot.dateBucket ? { dateBucket: effectivePivot.dateBucket } : {},
       client,
       rowCount: typeof response?.rowCount === "number" ? response.rowCount : void 0
@@ -21999,6 +22008,7 @@ function buildPivotOnlyReportFromResponse({
     pivotRows = pivotData.rows;
     pivotColumns = pivotData.columns;
     pivotRowCount = pivotData.rowCount;
+    pivotResultRowField = pivotData.rowField;
   }
   const pivotOnlyReport = {
     ...responseReport,
@@ -22010,7 +22020,9 @@ function buildPivotOnlyReportFromResponse({
     pivot: effectivePivot,
     pivotRows,
     pivotColumns,
-    pivotRowCount
+    pivotRowCount,
+    pivotResultRowField,
+    pivotResultSourceRowField: effectivePivot?.rowField
   };
   if (additionalProcessing) {
     pivotOnlyReport.pagination = additionalProcessing.page;
@@ -62292,6 +62304,12 @@ function mergeDisplayAndSourceForTableFormats(args) {
       for (const candidateKey of candidateKeys) {
         const candidates = sourceColumnsByKey.get(candidateKey) ?? [];
         if (candidates.length === 0) continue;
+        const exactFieldMatch = candidates.find(
+          (candidate) => String(candidate.field ?? "").trim() === candidateKey
+        );
+        if (exactFieldMatch) {
+          return exactFieldMatch;
+        }
         if (selection.table) {
           const tableMatch = candidates.find((candidate) => {
             return String(candidate.table ?? "").trim() === selection.table;
@@ -63372,6 +63390,8 @@ async function loadViaReportBuilderState({
       pivotRows: refreshedPivotData?.rows ?? compatibleReportPivotRows ?? (canReuseBasePivotRowsAndColumns ? baseReport.pivotRows : []) ?? [],
       pivotColumns: refreshedPivotData?.columns ?? compatibleReportPivotColumns ?? (canReuseBasePivotRowsAndColumns ? baseReport.pivotColumns : []) ?? [],
       pivotRowCount: refreshedPivotData?.rowCount ?? compatibleReportPivotRowCount ?? (canReuseBasePivotRowsAndColumns ? baseReport.pivotRowCount : void 0) ?? 0,
+      pivotResultRowField: refreshedPivotData?.rowField ?? reportBuilderInfo.report.pivotResultRowField ?? (canReuseBasePivotRowsAndColumns ? baseReport.pivotResultRowField : void 0),
+      pivotResultSourceRowField: refreshedPivotData?.rowField && requestedPivotRowField ? requestedPivotRowField : reportBuilderInfo.report.pivotResultSourceRowField ? reportBuilderInfo.report.pivotResultSourceRowField : canReuseBasePivotRowsAndColumns ? baseReport.pivotResultSourceRowField : void 0,
       uniqueStringsByTable: reportBuilderInfo.uniqueStringsByTable,
       uniqueStringsByColumn: reportBuilderInfo.uniqueStringsByColumn,
       columnUniqueValues: reportBuilderInfo.uniqueStringsByColumn,
@@ -64797,9 +64817,7 @@ function useReport(reportIdArg, options = {}) {
       reportId: effectiveReportId,
       draftSessionId,
       useInMemoryEngines,
-      hasInitialReportBuilderState: Boolean(
-        initialReportBuilderStateForLoad
-      ),
+      hasInitialReportBuilderState: Boolean(initialReportBuilderStateForLoad),
       reloadKeyHash,
       tenantHash,
       flagHash,
@@ -65622,11 +65640,7 @@ function useReport(reportIdArg, options = {}) {
       }
       return { ...currentReport, rowCount: countReport.rowCount };
     });
-  }, [
-    createdBootstrapRowCountQuery.data,
-    effectiveReportId,
-    sourceReport?.id
-  ]);
+  }, [createdBootstrapRowCountQuery.data, effectiveReportId, sourceReport?.id]);
   const chartTypes = useMemo33(() => {
     return getChartTypeOptions2({ pivot: pivotState });
   }, [pivotState]);
@@ -66411,6 +66425,8 @@ function useReport(reportIdArg, options = {}) {
           pivotRows: mergedPivotRows,
           pivotColumns: report.pivotColumns,
           pivotRowCount: mergedPivotRowCount,
+          pivotResultRowField: report.pivotResultRowField,
+          pivotResultSourceRowField: report.pivotResultSourceRowField,
           pivotQuery: report.pivotQuery,
           comparisonPivotQuery: report.comparisonPivotQuery,
           reportBuilderState: mergedReportBuilderState ? {
@@ -66430,7 +66446,11 @@ function useReport(reportIdArg, options = {}) {
   const chartData = useMemo33(() => {
     if (!sourceReport) return void 0;
     const rowsForChart = Array.isArray(sourceReport.rows) ? sourceReport.rows : [];
-    const chartPivotForDisplay = nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
+    const chartPivot = nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
+    const chartPivotForDisplay = chartPivot && sourceReport.pivotResultRowField && sourceReport.pivotResultSourceRowField === chartPivot.rowField ? {
+      ...chartPivot,
+      rowField: sourceReport.pivotResultRowField
+    } : chartPivot;
     const rowCountForChart = chartPivotForDisplay ? sourceReport.pivotRowCount ?? (Array.isArray(sourceReport.pivotRows) ? sourceReport.pivotRows.length : sourceReport.rowCount) : useInMemoryEngines ? rowsForChart.length : sourceReport.rowCount;
     const referencedTablesForChart = effectiveReportBuilderState?.tables.map((table2) => table2.name).filter((name2) => Boolean(name2));
     const pivotRowsForChart = Array.isArray(sourceReport.pivotRows) ? sourceReport.pivotRows : void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.16.69",
+  "version": "2.16.71",
   "type": "module",
   "exports": {
     ".": {