Merge pull request #650 from eJJonatah/develop

fix-date1904Attribute bool parsing possibility appointed on issue #649
ExcelDataReader · Jun 3, 2024 · 25e896d · 25e896d
2 parents cff3ecd + f019485
commit 25e896d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/ExcelDataReader/Core/OpenXmlFormat/XmlFormat/XmlWorkbookReader.cs b/src/ExcelDataReader/Core/OpenXmlFormat/XmlFormat/XmlWorkbookReader.cs
@@ -42,7 +42,7 @@ protected override IEnumerable<Record> ReadOverride()
                 if (Reader.IsStartElement(ElementWorkbookProperties, ProperNamespaces.NsSpreadsheetMl))
                 {
                     // Workbook VBA CodeName: reader.GetAttribute("codeName");
-                    bool date1904 = Reader.GetAttribute("date1904") == "1";
+                    bool date1904 = Reader.GetAttribute("date1904") is "1" or "true";
                     yield return new WorkbookPrRecord(date1904);
                     Reader.Skip();
                 }

diff --git a/test/ExcelDataReader.Tests/ExcelOpenXmlReaderTest.cs b/test/ExcelDataReader.Tests/ExcelOpenXmlReaderTest.cs
@@ -389,6 +389,14 @@ public void GitIssue425()
             Assert.That(dataSet.Tables[0].Rows[2].ItemArray[0], Is.EqualTo("text    text"));
         }
 
+        [Test]
+        public void GitIssue649()
+        {
+            using var reader = OpenReader("Test_git_issue_649_Date1904_Parsings");
+            var dataSet = reader.AsDataSet();
+            Assert.That(dataSet.Tables[0].Rows[11].ItemArray[12], Is.EqualTo(new DateTime(2023, 9, 1)));
+        }
+
         [Test]
         public void GitIssue518MultipleHeaderRows()
         {

diff --git a/test/Resources/Test_git_Issue_649_Date1904_Parsings.xlsx b/test/Resources/Test_git_Issue_649_Date1904_Parsings.xlsx