Skip to content

Fix column mapping in GroupBy and aggregation queries to ensure corre… #3750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Arpit Gupta (ar-guptaar) merged 5 commits into from
Aug 5, 2026
+339 −11
Merged

Fix column mapping in GroupBy and aggregation queries to ensure corre… #3750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac8f6fb
Fix column mapping in GroupBy and aggregation queries to ensure corre…
Aug 3, 2026
b585950
Add end-to-end regression tests for aggregations and groupBy on mappe…
Aug 3, 2026
fa2f83d
Fix column mapping in GroupByMetadata and add regression test for ord…
Aug 3, 2026
3900dcc
Add end-to-end regression tests for HAVING filters on mapped columns …
Aug 4, 2026
875abfc
Merge branch 'main' into dev/guptaar/fix-remapping-field-aggregation
aaronburtle Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Core/Resolvers/Sql Query Structures/SqlQueryStructure.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,7 @@ private void ProcessGroupByField(FieldNode groupByField, IMiddlewareContext ctx,
}

GroupByMetadata.Fields[columnName] = new Column(DatabaseObject.SchemaName, DatabaseObject.Name, columnName, SourceAlias);
AddColumn(fieldName, backingColumn ?? fieldName);
AddColumn(columnName: columnName, labelName: fieldName);
fieldsInArgument.Add(fieldName);
}
}
Expand Down Expand Up @@ -953,7 +953,7 @@ private void ProcessGroupByFieldSelections(FieldNode groupByFieldSelection, Hash
}

string columnName = MetadataProvider.TryGetBackingColumn(EntityName, fieldName, out string? backingColumn) ? backingColumn : fieldName;
AddColumn(fieldName, columnName);
AddColumn(columnName: columnName, labelName: fieldName);
}

}
Expand Down
15 changes: 8 additions & 7 deletions src/Core/Resolvers/SqlPaginationUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ public static JsonDocument CreatePaginationConnectionFromJsonDocument(JsonDocume

private static string GenerateGroupByObjectFromResult(GroupByMetadata groupByMetadata, IEnumerable<JsonElement> rootEnumerated)
{
HashSet<string> aggregationAliases = groupByMetadata.Aggregations
.Select(aggregation => aggregation.Column.OperationAlias)
.ToHashSet(StringComparer.Ordinal);

JsonArray groupByArray = new();
foreach (JsonElement element in rootEnumerated)
{
Expand All @@ -62,16 +66,13 @@ private static string GenerateGroupByObjectFromResult(GroupByMetadata groupByMet
JsonObject combinedObject = new();
foreach (JsonProperty property in element.EnumerateObject())
{
if (groupByMetadata.Fields.ContainsKey(property.Name))
if (aggregationAliases.Contains(property.Name))
{
if (groupByMetadata.RequestedFields)
{
fieldObject.Add(property.Name, JsonNode.Parse(property.Value.GetRawText()));
}
aggregationObject.Add(property.Name, JsonNode.Parse(property.Value.GetRawText()));
}
else
else if (groupByMetadata.RequestedFields)
{
aggregationObject.Add(property.Name, JsonNode.Parse(property.Value.GetRawText()));
fieldObject.Add(property.Name, JsonNode.Parse(property.Value.GetRawText()));
}
}

Expand Down
Loading