Skip to content

Fix nested struct mapping with multiple belongsTo associations #1817

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
zainforbjs merged 2 commits into from
Dec 18, 2025
Merged

Fix nested struct mapping with multiple belongsTo associations #1817

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49e278a
Fix nested struct mapping with multiple belongsTo associations
zainforbjs Dec 17, 2025
f00063f
Fix typo
zainforbjs Dec 18, 2025
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
21 changes: 13 additions & 8 deletions core/src/wheels/model/serialize.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,15 @@ component {
}
} else {
// We have a hasOne or belongsTo association, so just add the object to the root object.
local.joinAlias = "";
if (structKeyExists(variables.wheels.class.associations[local.include], "joinAlias")) {
local.joinAlias = variables.wheels.class.associations[local.include].joinAlias;
}
local.struct[local.include] = model(variables.wheels.class.associations[local.include].modelName).$queryRowToStruct(
properties = arguments.query,
row = local.i,
base = false
base = false,
joinAlias = local.joinAlias
);
}
}
Expand Down Expand Up @@ -180,20 +185,20 @@ component {
public struct function $queryRowToStruct(
required any properties,
string name = "#variables.wheels.class.modelName#",
numeric row = "1",
boolean base = "true"
numeric row = 1,
boolean base = true,
string joinAlias = ""
) {
local.rv = {};
local.allProperties = ListToArray(ListAppend(variables.wheels.class.propertyList, variables.wheels.class.calculatedPropertyList));
// a struct key is much faster than a list element
local.columnStruct = $listToStruct(arguments.properties.columnList);
local.iEnd = ArrayLen(local.allProperties);
for (local.i = 1; local.i <= local.iEnd; local.i++) {
local.prefix = Len(arguments.joinAlias)? arguments.joinAlias: arguments.name;
for (local.item in local.allProperties) {
// Wrap in try/catch because coldfusion has a problem with empty strings in queries for bit types.
try {
local.item = local.allProperties[local.i];
if (!arguments.base && StructKeyExists(local.columnStruct, arguments.name & local.item)) {
local.rv[local.item] = arguments.properties[arguments.name & local.item][arguments.row];
if (!arguments.base && StructKeyExists(local.columnStruct, local.prefix & local.item)) {
local.rv[local.item] = arguments.properties[local.prefix & local.item][arguments.row];
} else if (StructKeyExists(local.columnStruct, local.item)) {
local.rv[local.item] = arguments.properties[local.item][arguments.row];
}
Expand Down
Loading