From ef35c4fca807c9e42a5b5d5402ca49a062177b03 Mon Sep 17 00:00:00 2001 From: dfinke Date: Sun, 12 Jun 2022 09:53:52 -0400 Subject: [PATCH 1/4] Fix for EndRow and EndColumn Parameters Ignored in Import-Excel #1194 --- Public/Import-Excel.ps1 | 7 +++- .../ImportExcelTests/DataInDiffRowCol.xlsx | Bin 0 -> 9082 bytes .../ImportExcelEndRowEndColumn.tests.ps1 | 36 ++++++++++++++++++ .../ReadMultipleXLSXFiles.tests.ps1 | 2 +- 4 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 __tests__/ImportExcelTests/DataInDiffRowCol.xlsx create mode 100644 __tests__/ImportExcelTests/ImportExcelEndRowEndColumn.tests.ps1 diff --git a/Public/Import-Excel.ps1 b/Public/Import-Excel.ps1 index 819fa0c..f95bc25 100644 --- a/Public/Import-Excel.ps1 +++ b/Public/Import-Excel.ps1 @@ -134,8 +134,11 @@ $xlBook = [Ordered]@{} foreach ($sheet in $Worksheet) { - $EndRow = 0 - $EndColumn = 0 + if ($Worksheet.Count -gt 1 -or $Paths.Count -gt 1) { + $EndRow = 0 + $EndColumn = 0 + } + $targetSheetname = $sheet.Name $xlBook["$targetSheetname"] = @() #region Get rows and columns diff --git a/__tests__/ImportExcelTests/DataInDiffRowCol.xlsx b/__tests__/ImportExcelTests/DataInDiffRowCol.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..f09b5b7dcf063f11b703d3e81dcf91230ce2d37b GIT binary patch literal 9082 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 Date: Sun, 12 Jun 2022 10:42:16 -0400 Subject: [PATCH 2/4] Add additional tests --- Public/Import-Excel.ps1 | 9 ++++++-- .../DataInDiffRowColMultipleSheets.xlsx | Bin 0 -> 10197 bytes .../ImportExcelEndRowEndColumn.tests.ps1 | 21 +++++++++++++++--- .../ImportExcelReadSheets.tests.ps1 | 2 +- 4 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 __tests__/ImportExcelTests/DataInDiffRowColMultipleSheets.xlsx diff --git a/Public/Import-Excel.ps1 b/Public/Import-Excel.ps1 index f95bc25..b4fe004 100644 --- a/Public/Import-Excel.ps1 +++ b/Public/Import-Excel.ps1 @@ -135,8 +135,13 @@ $xlBook = [Ordered]@{} foreach ($sheet in $Worksheet) { if ($Worksheet.Count -gt 1 -or $Paths.Count -gt 1) { - $EndRow = 0 - $EndColumn = 0 + <# + Needed under these conditions to handle sheets of different number of Row/Col + - When reading more than one xlsx file + - When reading more than one worksheet in the same file + #> + $EndRow = $null + $EndColumn = $null } $targetSheetname = $sheet.Name diff --git a/__tests__/ImportExcelTests/DataInDiffRowColMultipleSheets.xlsx b/__tests__/ImportExcelTests/DataInDiffRowColMultipleSheets.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..cc3eaff57a5c1fbed275454f0cb39821fcb9e0a5 GIT binary patch literal 10197 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 Date: Sun, 12 Jun 2022 10:49:05 -0400 Subject: [PATCH 3/4] fix test --- __tests__/ImportExcelTests/ImportExcelReadSheets.tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tests__/ImportExcelTests/ImportExcelReadSheets.tests.ps1 b/__tests__/ImportExcelTests/ImportExcelReadSheets.tests.ps1 index 362f0aa..1b8dfad 100644 --- a/__tests__/ImportExcelTests/ImportExcelReadSheets.tests.ps1 +++ b/__tests__/ImportExcelTests/ImportExcelReadSheets.tests.ps1 @@ -23,7 +23,7 @@ Describe 'Different ways to import sheets' -Tag ImportExcelReadSheets { $actual.keys.Count | Should -Be 2 $actual["March"].Count | Should -Be 100 - $actual["June"].Count | Should -Be 100x` + $actual["June"].Count | Should -Be 100 } It 'Should read all the sheets' { From b789db9ba32a8cefa824e48a1b71155efd93f7ca Mon Sep 17 00:00:00 2001 From: dfinke Date: Sun, 12 Jun 2022 11:32:12 -0400 Subject: [PATCH 4/4] bump version --- ImportExcel.psd1 | 2 +- changelog.md | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ImportExcel.psd1 b/ImportExcel.psd1 index ccad95c..9b4e0e0 100644 --- a/ImportExcel.psd1 +++ b/ImportExcel.psd1 @@ -6,7 +6,7 @@ RootModule = 'ImportExcel.psm1' # Version number of this module. - ModuleVersion = '7.5.3' + ModuleVersion = '7.6.0' # ID used to uniquely identify this module GUID = '60dd4136-feff-401a-ba27-a84458c57ede' diff --git a/changelog.md b/changelog.md index 3e4eace..fde3f92 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,6 @@ +# 7.6.0 +- Fix -StartRow and -StartColumn being ignored. + # v7.5.2 - Changed the switch `-NotAsDictionary` to `-Raw`. Works with `-Worksheetname *` reads all the sheets in the xlsx file and returns an array.