Fix column count issue with xlsx reader moves to new worksheet. (#161)

* Fix for github issue 160: xlsx reader doesn't reset column state properly when advancing to new worksheet.

* Update release notes and bump version

docs/ReleaseNotes.md

@@ -1,5 +1,8 @@
 # Sylvan.Data.Excel Release Notes
 
+_0.4.20_
+- Fixes a bug where advancing to the next worksheet can result in the incorrect number of columns being reported when reading xlsx files.
+
 _0.4.19_
 - Fix a bug where headers might not be read properly on sheets after the first sheet.
 

source/Sylvan.Data.Excel.Tests/ExcelDataReaderTests.cs

@@ -1311,6 +1311,53 @@ public void ChartSheet()
  Assert.Equal("Sheet1", edr.WorksheetName);
  }
 
+ [Fact]
+ public void MultiSheetHeader()
+ {
+ var file = GetFile("MultiSheet2");
+ using var edr = ExcelDataReader.Create(file);
+ edr.NextResult(); 
+ edr.NextResult();
+ edr.Read();
+ Assert.Equal(5, edr.FieldCount);
+ for (int i = 0; i < edr.FieldCount; i++)
+ {
+ var expected = "" + (char)('v' + i);
+ Assert.Equal(expected, edr.GetName(i));
+ }
+
+ for (int i = 0; i < edr.FieldCount; i++)
+ {
+ var expected = "" + (char)('1' + i);
+ Assert.Equal(expected, edr.GetString(i));
+ }
+ }
+
+ [Fact]
+ public void MultiSheetNoHeader()
+ {
+ var opt = new ExcelDataReaderOptions { Schema = ExcelSchema.NoHeaders };
+ var file = GetFile("MultiSheet2");
+ using var edr = ExcelDataReader.Create(file, opt);
+
+ edr.NextResult();
+ edr.NextResult();
+ edr.Read();
+ Assert.Equal(5, edr.FieldCount);
+ // in no-headers mode the column names will be the Excel column names: A, B, C .. AA, AB, etc
+ for (int i = 0; i < edr.FieldCount; i++)
+ {
+ var expected = "" + (char)('A' + i);
+ Assert.Equal(expected, edr.GetName(i));
+ }
+
+ for (int i = 0; i < edr.FieldCount; i++)
+ {
+ var expected = "" + (char)('v' + i);
+ Assert.Equal(expected, edr.GetString(i));
+ }
+ }
+
 #if ASYNC
 
  [Fact]

source/Sylvan.Data.Excel/Sylvan.Data.Excel.csproj

@@ -3,7 +3,8 @@
  <PropertyGroup>
  <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
  <LangVersion>latest</LangVersion>
- <VersionPrefix>0.4.19</VersionPrefix>
+ <VersionPrefix>0.4.20</VersionPrefix>
+ <VersionSuffix>b0001</VersionSuffix>
  <Description>A cross-platform .NET library for reading Excel data files.</Description>
  <PackageTags>excel;xls;xlsx;xlsb;datareader</PackageTags>
  <Nullable>enable</Nullable>

source/Sylvan.Data.Excel/Xlsx/XlsxWorkbookReader.cs

@@ -216,6 +216,7 @@ private protected override bool OpenWorksheet(int sheetIdx)
 
  this.reader = XmlReader.Create(tr, settings);
  this.rowIndex = 0;
+ this.rowFieldCount = this.curFieldCount = 0;
  // worksheet
  while (reader.Read())
  {
@@ -292,6 +293,10 @@ bool InitializeSheet()
  this.curFieldCount = rowFieldCount;
  this.rowFieldCount = 0;
  }
+ else
+ {
+ this.curFieldCount = rowFieldCount;
+ }
 
  if (LoadSchema())
  {