DataRow: Unwrap PSObject values when assigning columns by FOWEPJF255 · Pull Request #28221 · PowerShell/PowerShell · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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/System.Management.Automation/engine/CoreAdapter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4687,14 +4687,24 @@ private DynamicMetaObject InvokeIndexer(
}

Expression[] indexExprs = new Expression[paramLength];
// DataRow and DataRowView indexers accept object values but validate them against their column type.
// Unwrap PowerShell's wrapper so their internal type checks see the underlying .NET value.
bool unwrapValue = setter.DeclaringType == typeof(DataRow) || setter.DeclaringType == typeof(DataRowView);
for (int i = 0; i < paramLength; ++i)
{
var parameterType = setterParams[i].ParameterType;
var argument = (i == paramLength - 1) ? value : indexes[i];

indexExprs[i] = parameterType.IsByRefLike
? PSConvertBinder.ConvertToByRefLikeTypeViaCasting(argument, parameterType)
: PSGetIndexBinder.ConvertIndex(argument, parameterType);
if (unwrapValue && i == paramLength - 1 && parameterType == typeof(object) && argument.LimitType == typeof(PSObject))
{
indexExprs[i] = Expression.Call(CachedReflectionInfo.PSObject_Base, argument.Expression.Cast(typeof(PSObject)));
}
else
{
indexExprs[i] = parameterType.IsByRefLike
? PSConvertBinder.ConvertToByRefLikeTypeViaCasting(argument, parameterType)
: PSGetIndexBinder.ConvertIndex(argument, parameterType);
}

if (indexExprs[i] == null)
{
Expand Down
29 changes: 29 additions & 0 deletions test/powershell/engine/ETS/Adapter.Tests.ps1