Skip to content

Update from upstream repo powershell/powershell@master #16

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

Update from upstream repo powershell/powershell@master #16

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
20b2e3d
No longer skips a column without name if double quote delimiter is us…
Topping Oct 5, 2018
09f5471
Use params in ImportPSModule (#7933)
iSazonov Oct 5, 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
5 changes: 4 additions & 1 deletion src/System.Management.Automation/engine/InitialSessionState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1842,10 +1842,13 @@ public Microsoft.PowerShell.ExecutionPolicy ExecutionPolicy
/// </summary>
/// <param name="name">The modules to add</param>
/// <returns></returns>
public void ImportPSModule(string[] name)
public void ImportPSModule(params string[] name)
{
if (name == null)
{
throw new ArgumentNullException("name");
}

foreach (string n in name)
{
ModuleSpecificationsToImport.Add(new ModuleSpecification(n));
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
$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