Skip to content

No longer skips a column without name if double quote delimiter is used in Import-Csv #7899

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
iSazonov merged 7 commits into from
Oct 5, 2018
Merged

No longer skips a column without name if double quote delimiter is used in Import-Csv #7899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
445fc77
Fixed handling of double quotes with quote delimiter
Topping Oct 1, 2018
0916f41
Cleaned whitespace
Topping Oct 1, 2018
0e9a0a6
Refactored test to use -TestCases
Topping Oct 1, 2018
d195c63
Added newline to all test files
Topping Oct 1, 2018
9f8107b
Added import-csv.tests content inline in the test.
Topping Oct 3, 2018
38436ca
Added indentation to the here-string in import-csv
Topping Oct 3, 2018
082e80f
Replaced erroneous tabs with spaces
Topping Oct 3, 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
7 changes: 5 additions & 2 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/CSVCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1610,9 +1610,12 @@ private void
{
string name = names[i];
string value = null;
////if name is null and delimiter is '"', continue
////if name is null and delimiter is '"', use a default property name 'UnspecifiedName'
if (name.Length == 0 && delimiterlocal == '"')
continue;
{
name = UnspecifiedName + unspecifiedNameIndex;
unspecifiedNameIndex++;
}
////if name is null and delimiter is not '"', use a default property name 'UnspecifiedName'
if (string.IsNullOrEmpty(name))
{
Expand Down
32 changes: 32 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/Import-Csv.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,38 @@ Describe "Import-Csv DRT Unit Tests" -Tags "CI" {
}
}

Describe "Import-Csv Double Quote Delimiter" -Tags "CI" {
BeforeAll {
$empyValueCsv = @'
a1""a3
v1"v2"v3
'@

$withValueCsv = @'
a1"a2"a3
v1"v2"v3
'@

$quotedCharacterCsv = @'
a1,a2,a3
v1,"v2",v3
'@
}


It "Should handle <name>" -TestCases @(
@{ name = "quote with empty value" ; expectedHeader = "a1,H1,a3"; file = "EmptyValue.csv" ; content = $empyValueCsv ; delimiter = '"' }
@{ name = "quote with value" ; expectedHeader = "a1,a2,a3"; file = "WithValue.csv" ; content = $withValueCsv ; delimiter = '"' }
@{ name = "value enclosed in quote" ; expectedHeader = "a1,a2,a3"; file = "QuotedCharacter.csv" ; content = $quotedCharacterCsv ; delimiter = ',' }
){
param($expectedHeader, $file, $content, $delimiter)
Set-Content testdrive:/$file -Value $content
Copy link
Collaborator

@iSazonov iSazonov Oct 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Usualy we do this in BeforeAll block. Then we could pass only file name to the block.

Copy link
Member

@SteveL-MSFT SteveL-MSFT Oct 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having it in BeforeAll makes sense if multiple tests use the same test content, but in this case only this test uses them so I think it's ok to just have it here closer to the test code.

$returnObject = Import-Csv -Path testdrive:/$file -Delimiter $delimiter
$actualHeader = $returnObject[0].psobject.Properties.name -join ','
$actualHeader | Should -Be $expectedHeader
}
}

Describe "Import-Csv File Format Tests" -Tags "CI" {
BeforeAll {
# The file is w/o header
Expand Down