@quillsql/react 2.16.90 → 2.16.91

package/dist/index.cjs

@@ -18641,6 +18641,19 @@ function replaceBigQuerySpecialCharacters(column) {
 function processColumnReference(column, databaseType, fallbackOnNull, isColumnFieldAlias, isValueFieldAlias) {
   switch (databaseType.toLowerCase()) {
     case "postgresql":
+    case "redshift": {
+      if (column === "") {
+        return fallbackOnNull ? `"${fallbackOnNull}"` : `"_"`;
+      }
+      if (isColumnFieldAlias) {
+        return `"${column.replaceAll('"', "")}"`;
+      }
+      const columnParts = column.split(".");
+      if (columnParts.length > 1) {
+        return `"` + columnParts.map((part) => part.replaceAll('"', "")).join('"."') + `"`;
+      }
+      return `"${column.replaceAll('"', "")}"`;
+    }
     case "clickhouse": {
       if (column === "") {
         return fallbackOnNull ? `"${fallbackOnNull}"` : `"_"`;
@@ -18755,6 +18768,8 @@ function generateDistinctQuery(stringFields, query, databaseType) {
       return generateDistinctQueryBigQuery(stringFields, query);
     case "postgresql":
       return generateDistinctQueryPostgres(stringFields, query);
+    case "redshift":
+      return generateDistinctQueryRedshift(stringFields, query);
     case "snowflake":
       return generateDistinctQuerySnowflake(stringFields, query);
     case "mssql":
@@ -18801,6 +18816,13 @@ function generateDistinctQueryPostgres(stringFields, query) {
   const distinctQuery = distinctQueries.join(" UNION ALL ");
   return `WITH querytable AS (${query.replace(";", "")}) ` + distinctQuery;
 }
+function generateDistinctQueryRedshift(stringFields, query) {
+  const distinctQueries = stringFields.map((field) => {
+    return `SELECT '${field}' AS "field", LISTAGG(DISTINCT "${field}") AS "string_values" FROM querytable`;
+  });
+  const distinctQuery = distinctQueries.join(" UNION ALL ");
+  return `WITH querytable AS (${query.replace(";", "")}) ` + distinctQuery;
+}
 function generateDistinctQuerySnowflake(stringFields, query) {
   const distinctQueries = stringFields.map((field) => {
     return `SELECT '${field}' AS "field", ARRAY_AGG(DISTINCT "${field}") AS "string_values" FROM querytable`;
@@ -18842,7 +18864,7 @@ function generateMinMaxDateRangeQueries(columnFields, query, databaseType) {
   const min2 = "MIN";
   const cast = databaseType.toLowerCase() === "snowflake" ? "::TIMESTAMP_TZ" : "";
   const distinctQueries = columnFields.map((field) => {
-    const wrappedField = ["postgresql", "clickhouse"].includes(
+    const wrappedField = ["postgresql", "redshift", "clickhouse"].includes(
       databaseType.toLowerCase()
     ) ? processColumnReference(field, databaseType) : field;
     return `SELECT '${field}' AS ${processColumnReference("field", databaseType)}, ${min2}(${wrappedField})${cast} AS ${processColumnReference("min_range", databaseType)}, ${max2}(${wrappedField})${cast} AS ${processColumnReference("max_range", databaseType)} FROM querytable`;
@@ -53707,6 +53729,7 @@ function generateSuggestionsByDatasource(monaco, range, databaseType) {
   switch (databaseType.toLowerCase()) {
     case "snowflake":
     case "postgresql":
+    case "redshift":
       return [
         ...POSTGRES_DATASOURCE_SUGGESTIONS(monaco, range),
         ...GENERIC_DATASOURCE_SUGGESTIONS(monaco, range)
@@ -66534,9 +66557,8 @@ function useReport(reportIdArg, options = {}) {
   }, [schemaForReportBuilderState, schemaForeignKeyMap]);
   const reportBuilderBaseTableNamesKey = (sourceReport?.reportBuilderState?.tables ?? []).map((t) => String(t?.name ?? "").trim()).filter(Boolean).join("\0") ?? "";
   const selectedBaseTableNamesForFieldOptions = (0, import_react63.useMemo)(() => {
-    const fromPicker = schemaDatasourceIds?.map((id) => String(id ?? "").trim()).filter(Boolean) ?? [];
-    if (fromPicker.length > 0) {
-      return fromPicker;
+    if (Array.isArray(schemaDatasourceIds)) {
+      return schemaDatasourceIds.map((id) => String(id ?? "").trim()).filter(Boolean);
     }
     return (sourceReport?.reportBuilderState?.tables ?? []).map((t) => String(t?.name ?? "").trim()).filter(Boolean);
   }, [schemaDatasourceIdsKey, reportBuilderBaseTableNamesKey]);
@@ -67886,7 +67908,7 @@ function useReport(reportIdArg, options = {}) {
     prevPivotStateForColumnExpansionRef.current = pivotState;
   }, [pivotState]);
   const effectiveReportBuilderTables = (0, import_react63.useMemo)(() => {
-    const explicitBaseFromSchemaPicker = Array.isArray(schemaDatasourceIds) && schemaDatasourceIds.length > 0 ? schemaDatasourceIds.map((tableName) => String(tableName ?? "").trim()).filter(Boolean).map((name2) => ({ name: name2 })) : null;
+    const explicitBaseFromSchemaPicker = Array.isArray(schemaDatasourceIds) ? schemaDatasourceIds.map((tableName) => String(tableName ?? "").trim()).filter(Boolean).map((name2) => ({ name: name2 })) : null;
     const baseTablesForMerge = explicitBaseFromSchemaPicker ?? baseReportBuilderTables;
     return mergeReportBuilderTables(
       baseTablesForMerge,
@@ -67920,6 +67942,12 @@ function useReport(reportIdArg, options = {}) {
     () => baseReportBuilderTables.map((table2) => String(table2.name ?? "").trim()).filter((name2) => Boolean(name2)),
     [baseReportBuilderTables]
   );
+  const datasourcePickerValues = (0, import_react63.useMemo)(() => {
+    if (Array.isArray(schemaDatasourceIds)) {
+      return schemaDatasourceIds.map((tableName) => String(tableName ?? "").trim()).filter((name2) => Boolean(name2));
+    }
+    return baseReportBuilderTableNames;
+  }, [baseReportBuilderTableNames, schemaDatasourceIdsKey]);
   const normalizeQueryBuilderFieldNameForConfig = (0, import_react63.useMemo)(() => {
     const configEntries = Object.entries(queryBuilderFieldConfigByName);
     const preferredTableNames = /* @__PURE__ */ new Set([
@@ -70716,7 +70744,7 @@ function useReport(reportIdArg, options = {}) {
         }
         if (effectiveNextState.datasources !== void 0) {
           const nextIds = effectiveNextState.datasources.map((tableName) => String(tableName ?? "").trim()).filter(Boolean);
-          next.schemaDatasourceIds = nextIds.length > 0 ? nextIds : void 0;
+          next.schemaDatasourceIds = nextIds;
           if (nextIds.length > 0) {
             pruneFormStateToExplicitDatasourceTables(next, nextIds, {
               sourceReport,
@@ -70769,6 +70797,15 @@ function useReport(reportIdArg, options = {}) {
                 }
               }
             }
+          } else {
+            next.queryColumns = [];
+            next.groupRowsBy = void 0;
+            next.groupColumnsBy = void 0;
+            next.aggregationState = [];
+            next.aggregationTablesByIndex = [];
+            next.pivotSort = void 0;
+            next.regularSort = void 0;
+            next.queryFilters = { combinator: "and", rules: [] };
           }
         }
         if (effectiveNextState.columns !== void 0) {
@@ -70789,6 +70826,8 @@ function useReport(reportIdArg, options = {}) {
           if (replacesDatasourceTableScope) {
             next.queryColumns = normalizedDisplayColumns;
             next.schemaDatasourceIds = [...requestedDisplayTableNames];
+          } else if (effectiveNextState.datasources !== void 0 && normalizedDisplayColumns.length === 0) {
+            next.queryColumns = [];
           } else {
             next.queryColumns = mergeReportBuilderColumns(
               next.queryColumns,
@@ -71296,6 +71335,7 @@ function useReport(reportIdArg, options = {}) {
     reportId: effectiveReportId || void 0,
     /* ── Selected value + pick list (same naming pattern throughout) ── */
     datasources,
+    datasourcePickerValues,
     datasourceOptions,
     groupRowsBy,
     groupRowsByOptions,

package/dist/index.d.cts

@@ -3275,7 +3275,8 @@ interface SetReportBuilderInput {
     chartAxes?: SetReportChartAxesInput;
     /**
      * Schema table names for datasource / multi-table picker UIs.
-     * Empty array clears the override (report base tables apply again).
+     * An empty array clears the picker selection; omit or pass `undefined` via
+     * report switches to fall back to saved report base tables.
      */
     datasources?: string[];
 }
@@ -3451,6 +3452,7 @@ declare function useReport(reportIdArg?: string, options?: UseReportOptions): {
      */
     reportId: string | undefined;
     datasources: string[];
+    datasourcePickerValues: string[];
     datasourceOptions: DatasourceOption[];
     groupRowsBy: string | undefined;
     groupRowsByOptions: SelectOption[];

package/dist/index.d.ts

@@ -3275,7 +3275,8 @@ interface SetReportBuilderInput {
     chartAxes?: SetReportChartAxesInput;
     /**
      * Schema table names for datasource / multi-table picker UIs.
-     * Empty array clears the override (report base tables apply again).
+     * An empty array clears the picker selection; omit or pass `undefined` via
+     * report switches to fall back to saved report base tables.
      */
     datasources?: string[];
 }
@@ -3451,6 +3452,7 @@ declare function useReport(reportIdArg?: string, options?: UseReportOptions): {
      */
     reportId: string | undefined;
     datasources: string[];
+    datasourcePickerValues: string[];
     datasourceOptions: DatasourceOption[];
     groupRowsBy: string | undefined;
     groupRowsByOptions: SelectOption[];

package/dist/index.js

@@ -18687,6 +18687,19 @@ function replaceBigQuerySpecialCharacters(column) {
 function processColumnReference(column, databaseType, fallbackOnNull, isColumnFieldAlias, isValueFieldAlias) {
   switch (databaseType.toLowerCase()) {
     case "postgresql":
+    case "redshift": {
+      if (column === "") {
+        return fallbackOnNull ? `"${fallbackOnNull}"` : `"_"`;
+      }
+      if (isColumnFieldAlias) {
+        return `"${column.replaceAll('"', "")}"`;
+      }
+      const columnParts = column.split(".");
+      if (columnParts.length > 1) {
+        return `"` + columnParts.map((part) => part.replaceAll('"', "")).join('"."') + `"`;
+      }
+      return `"${column.replaceAll('"', "")}"`;
+    }
     case "clickhouse": {
       if (column === "") {
         return fallbackOnNull ? `"${fallbackOnNull}"` : `"_"`;
@@ -18801,6 +18814,8 @@ function generateDistinctQuery(stringFields, query, databaseType) {
       return generateDistinctQueryBigQuery(stringFields, query);
     case "postgresql":
       return generateDistinctQueryPostgres(stringFields, query);
+    case "redshift":
+      return generateDistinctQueryRedshift(stringFields, query);
     case "snowflake":
       return generateDistinctQuerySnowflake(stringFields, query);
     case "mssql":
@@ -18847,6 +18862,13 @@ function generateDistinctQueryPostgres(stringFields, query) {
   const distinctQuery = distinctQueries.join(" UNION ALL ");
   return `WITH querytable AS (${query.replace(";", "")}) ` + distinctQuery;
 }
+function generateDistinctQueryRedshift(stringFields, query) {
+  const distinctQueries = stringFields.map((field) => {
+    return `SELECT '${field}' AS "field", LISTAGG(DISTINCT "${field}") AS "string_values" FROM querytable`;
+  });
+  const distinctQuery = distinctQueries.join(" UNION ALL ");
+  return `WITH querytable AS (${query.replace(";", "")}) ` + distinctQuery;
+}
 function generateDistinctQuerySnowflake(stringFields, query) {
   const distinctQueries = stringFields.map((field) => {
     return `SELECT '${field}' AS "field", ARRAY_AGG(DISTINCT "${field}") AS "string_values" FROM querytable`;
@@ -18888,7 +18910,7 @@ function generateMinMaxDateRangeQueries(columnFields, query, databaseType) {
   const min2 = "MIN";
   const cast = databaseType.toLowerCase() === "snowflake" ? "::TIMESTAMP_TZ" : "";
   const distinctQueries = columnFields.map((field) => {
-    const wrappedField = ["postgresql", "clickhouse"].includes(
+    const wrappedField = ["postgresql", "redshift", "clickhouse"].includes(
       databaseType.toLowerCase()
     ) ? processColumnReference(field, databaseType) : field;
     return `SELECT '${field}' AS ${processColumnReference("field", databaseType)}, ${min2}(${wrappedField})${cast} AS ${processColumnReference("min_range", databaseType)}, ${max2}(${wrappedField})${cast} AS ${processColumnReference("max_range", databaseType)} FROM querytable`;
@@ -53860,6 +53882,7 @@ function generateSuggestionsByDatasource(monaco, range, databaseType) {
   switch (databaseType.toLowerCase()) {
     case "snowflake":
     case "postgresql":
+    case "redshift":
       return [
         ...POSTGRES_DATASOURCE_SUGGESTIONS(monaco, range),
         ...GENERIC_DATASOURCE_SUGGESTIONS(monaco, range)
@@ -66742,9 +66765,8 @@ function useReport(reportIdArg, options = {}) {
   }, [schemaForReportBuilderState, schemaForeignKeyMap]);
   const reportBuilderBaseTableNamesKey = (sourceReport?.reportBuilderState?.tables ?? []).map((t) => String(t?.name ?? "").trim()).filter(Boolean).join("\0") ?? "";
   const selectedBaseTableNamesForFieldOptions = useMemo33(() => {
-    const fromPicker = schemaDatasourceIds?.map((id) => String(id ?? "").trim()).filter(Boolean) ?? [];
-    if (fromPicker.length > 0) {
-      return fromPicker;
+    if (Array.isArray(schemaDatasourceIds)) {
+      return schemaDatasourceIds.map((id) => String(id ?? "").trim()).filter(Boolean);
     }
     return (sourceReport?.reportBuilderState?.tables ?? []).map((t) => String(t?.name ?? "").trim()).filter(Boolean);
   }, [schemaDatasourceIdsKey, reportBuilderBaseTableNamesKey]);
@@ -68094,7 +68116,7 @@ function useReport(reportIdArg, options = {}) {
     prevPivotStateForColumnExpansionRef.current = pivotState;
   }, [pivotState]);
   const effectiveReportBuilderTables = useMemo33(() => {
-    const explicitBaseFromSchemaPicker = Array.isArray(schemaDatasourceIds) && schemaDatasourceIds.length > 0 ? schemaDatasourceIds.map((tableName) => String(tableName ?? "").trim()).filter(Boolean).map((name2) => ({ name: name2 })) : null;
+    const explicitBaseFromSchemaPicker = Array.isArray(schemaDatasourceIds) ? schemaDatasourceIds.map((tableName) => String(tableName ?? "").trim()).filter(Boolean).map((name2) => ({ name: name2 })) : null;
     const baseTablesForMerge = explicitBaseFromSchemaPicker ?? baseReportBuilderTables;
     return mergeReportBuilderTables(
       baseTablesForMerge,
@@ -68128,6 +68150,12 @@ function useReport(reportIdArg, options = {}) {
     () => baseReportBuilderTables.map((table2) => String(table2.name ?? "").trim()).filter((name2) => Boolean(name2)),
     [baseReportBuilderTables]
   );
+  const datasourcePickerValues = useMemo33(() => {
+    if (Array.isArray(schemaDatasourceIds)) {
+      return schemaDatasourceIds.map((tableName) => String(tableName ?? "").trim()).filter((name2) => Boolean(name2));
+    }
+    return baseReportBuilderTableNames;
+  }, [baseReportBuilderTableNames, schemaDatasourceIdsKey]);
   const normalizeQueryBuilderFieldNameForConfig = useMemo33(() => {
     const configEntries = Object.entries(queryBuilderFieldConfigByName);
     const preferredTableNames = /* @__PURE__ */ new Set([
@@ -70924,7 +70952,7 @@ function useReport(reportIdArg, options = {}) {
         }
         if (effectiveNextState.datasources !== void 0) {
           const nextIds = effectiveNextState.datasources.map((tableName) => String(tableName ?? "").trim()).filter(Boolean);
-          next.schemaDatasourceIds = nextIds.length > 0 ? nextIds : void 0;
+          next.schemaDatasourceIds = nextIds;
           if (nextIds.length > 0) {
             pruneFormStateToExplicitDatasourceTables(next, nextIds, {
               sourceReport,
@@ -70977,6 +71005,15 @@ function useReport(reportIdArg, options = {}) {
                 }
               }
             }
+          } else {
+            next.queryColumns = [];
+            next.groupRowsBy = void 0;
+            next.groupColumnsBy = void 0;
+            next.aggregationState = [];
+            next.aggregationTablesByIndex = [];
+            next.pivotSort = void 0;
+            next.regularSort = void 0;
+            next.queryFilters = { combinator: "and", rules: [] };
           }
         }
         if (effectiveNextState.columns !== void 0) {
@@ -70997,6 +71034,8 @@ function useReport(reportIdArg, options = {}) {
           if (replacesDatasourceTableScope) {
             next.queryColumns = normalizedDisplayColumns;
             next.schemaDatasourceIds = [...requestedDisplayTableNames];
+          } else if (effectiveNextState.datasources !== void 0 && normalizedDisplayColumns.length === 0) {
+            next.queryColumns = [];
           } else {
             next.queryColumns = mergeReportBuilderColumns(
               next.queryColumns,
@@ -71504,6 +71543,7 @@ function useReport(reportIdArg, options = {}) {
     reportId: effectiveReportId || void 0,
     /* ── Selected value + pick list (same naming pattern throughout) ── */
     datasources,
+    datasourcePickerValues,
     datasourceOptions,
     groupRowsBy,
     groupRowsByOptions,

package/package.json

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