Skip to content

Make LanguagePrimitive.GetEnumerable treat 'DataTable' as Enumerable #6511

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
adityapatwardhan merged 2 commits into from
Mar 29, 2018
Merged

Make LanguagePrimitive.GetEnumerable treat 'DataTable' as Enumerable #6511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d3eab7
Make LanguagePrimitive.GetEnumerable treat 'DataTable' as Enumerable
daxian-dbw Mar 27, 2018
0dbaebf
Fix a typo in the test
daxian-dbw Mar 27, 2018
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: 0 additions & 4 deletions src/System.Management.Automation/engine/LanguagePrimitives.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,12 +476,10 @@ private static IEnumerable ReturnNullEnumerable(object obj)
return null;
}

#if !CORECLR
private static IEnumerable DataTableEnumerable(object obj)
{
return (((DataTable)obj).Rows);
}
#endif

private static IEnumerable TypicalEnumerable(object obj)
{
Expand Down Expand Up @@ -517,12 +515,10 @@ private static IEnumerable TypicalEnumerable(object obj)

private static GetEnumerableDelegate CalculateGetEnumerable(Type objectType)
{
#if !CORECLR
if (typeof(DataTable).IsAssignableFrom(objectType))
{
return LanguagePrimitives.DataTableEnumerable;
}
#endif

// Don't treat IDictionary or XmlNode as enumerable...
if (typeof(IEnumerable).IsAssignableFrom(objectType)
Expand Down
14 changes: 14 additions & 0 deletions test/powershell/engine/Api/LanguagePrimitive.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,18 @@ Describe "Language Primitive Tests" -Tags "CI" {
$a[0] = $a = [PSObject](,1)
[System.Management.Automation.LanguagePrimitives]::IsTrue($a) | Should -BeTrue
}

It "LanguagePrimitives.GetEnumerable should treat 'DataTable' as Enumerable" {
$dt = [System.Data.DataTable]::new("test")
$dt.Columns.Add("Name", [string]) > $null
$dt.Columns.Add("Age", [string]) > $null
$dr = $dt.NewRow(); $dr["Name"] = "John"; $dr["Age"] = "20"
$dr2 = $dt.NewRow(); $dr["Name"] = "Susan"; $dr["Age"] = "25"
$dt.Rows.Add($dr); $dt.Rows.Add($dr2)

[System.Management.Automation.LanguagePrimitives]::IsObjectEnumerable($dt) | Should -BeTrue
$count = 0
[System.Management.Automation.LanguagePrimitives]::GetEnumerable($dt) | ForEach-Object { $count++ }
$count | Should -Be 2
}
}