Skip to content
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

Depict null values in array type ECProperty output #806

Draft
wants to merge 16 commits into
base: main
Choose a base branch
from
Draft

Depict null values in array type ECProperty output #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d2096ad
Adjust ECSqlRowAdaptor to allow nulls in arrays for both primitives a…
6ar8nas Jul 9, 2024
39c951a
address the same issue in JsonECSqlSelectAdapter as well
6ar8nas Jul 9, 2024
a177a41
Merge branch 'main' into Sarunas/array-includes-nulls
6ar8nas Jul 15, 2024
03668c2
Merge branch 'main' into Sarunas/array-includes-nulls
6ar8nas Jul 16, 2024
c87701f
Merge branch 'main' into Sarunas/array-includes-nulls
6ar8nas Jul 17, 2024
d4cde6b
Merge branch 'main' into Sarunas/array-includes-nulls
6ar8nas Jul 23, 2024
633c1b1
Bump test schema version to latest
6ar8nas Jul 24, 2024
671ae03
Merge branch 'main' into Sarunas/array-includes-nulls
6ar8nas Jul 24, 2024
886c3f8
Merge branch 'main' into Sarunas/array-includes-nulls
6ar8nas Jul 25, 2024
446f3f5
Merge remote-tracking branch 'origin/main' into Sarunas/array-include…
soham-bentley Dec 19, 2024
c4059e5
Merge remote-tracking branch 'origin/main' into Sarunas/array-include…
soham-bentley Jan 8, 2025
36edf31
Merge remote-tracking branch 'origin/main' into Sarunas/array-include…
soham-bentley Jan 9, 2025
c9267da
Merge remote-tracking branch 'origin/main' into Sarunas/array-include…
soham-bentley Jan 10, 2025
f3d95b1
Merge remote-tracking branch 'origin/main' into Sarunas/array-include…
soham-bentley Jan 13, 2025
e2bfbb3
Merge remote-tracking branch 'origin/main' into Sarunas/array-include…
soham-bentley Jan 14, 2025
117a2c6
Merge branch 'main' into Sarunas/array-includes-nulls
khanaffan Jan 28, 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
15 changes: 13 additions & 2 deletions iModelCore/ECDb/ECDb/ECSql/JsonECSqlSelectAdapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,10 +502,14 @@ BentleyStatus AdapterHelper::PrimitiveArrayToJson(BeJsValue jsonValue, IECSqlVal
jsonValue.SetEmptyArray();
for (IECSqlValue const& arrayElementValue : ecsqlValue.GetArrayIterable())
{
BeJsValue arrayElementJsonValue = jsonValue.appendValue();
if (arrayElementValue.IsNull())
{
arrayElementJsonValue.SetNull();
continue;
}

if (SUCCESS != PrimitiveToJson(jsonValue.appendValue(), arrayElementValue, arrayElementType, formatOptions, abbreviateBlobs))
if (SUCCESS != PrimitiveToJson(arrayElementJsonValue, arrayElementValue, arrayElementType, formatOptions, abbreviateBlobs))
return ERROR;
}

Expand All @@ -520,7 +524,14 @@ BentleyStatus AdapterHelper::StructArrayToJson(BeJsValue jsonValue, IECSqlValue
jsonValue.SetEmptyArray();
for (IECSqlValue const& arrayElementValue : ecsqlValue.GetArrayIterable())
{
if (SUCCESS != StructToJson(jsonValue.appendValue(), arrayElementValue, schemaManager, formatOptions))
BeJsValue arrayElementJsonValue = jsonValue.appendValue();
if (arrayElementValue.IsNull())
{
arrayElementJsonValue.SetNull();
continue;
}

if (SUCCESS != StructToJson(arrayElementJsonValue, arrayElementValue, schemaManager, formatOptions))
return ERROR;
}

Expand Down
Loading