Merge pull request #359 from ExcelDataReader/develop

3.4.2
ExcelDataReader · Oct 14, 2018 · 6793a9c · 6793a9c
2 parents de60db2 + ac357cc
commit 6793a9c
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 5 deletions.
diff --git a/src/ExcelDataReader.DataSet/ExcelDataReader.DataSet.csproj b/src/ExcelDataReader.DataSet/ExcelDataReader.DataSet.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>ExcelDataReader extension for reading Microsoft Excel files into System.Data.DataSet.</Description>
     <AssemblyTitle>ExcelDataReader.DataSet</AssemblyTitle>
-    <VersionPrefix>3.4.1</VersionPrefix>
+    <VersionPrefix>3.4.2</VersionPrefix>
     <Authors>ExcelDataReader developers</Authors>
     <TargetFrameworks>net20;net35;netstandard2.0</TargetFrameworks>
     <AssemblyName>ExcelDataReader.DataSet</AssemblyName>

diff --git a/src/ExcelDataReader/Core/CsvFormat/CsvParser.cs b/src/ExcelDataReader/Core/CsvFormat/CsvParser.cs
@@ -75,7 +75,7 @@ public void ParseBuffer(byte[] bytes, int offset, int count, out List<List<strin
 
         public void Flush(out List<List<string>> rows)
         {
-            if (State != CsvState.PreValue)
+            if (ValueResult.Length > 0 || RowResult.Count > 0)
             {
                 AddValueToRow();
                 AddRowToResult();

diff --git a/src/ExcelDataReader/Core/OpenXmlFormat/XlsxWorkbook.cs b/src/ExcelDataReader/Core/OpenXmlFormat/XlsxWorkbook.cs
@@ -7,6 +7,7 @@ internal class XlsxWorkbook : IWorkbook<XlsxWorksheet>
     {
         private const string NsSpreadsheetMl = "http://schemas.openxmlformats.org/spreadsheetml/2006/main";
         private const string NsRelationship = "http://schemas.openxmlformats.org/package/2006/relationships";
+        private const string NsDocumentRelationship = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
         private const string ElementSst = "sst";
         private const string ElementSheets = "sheets";
         private const string ElementSheet = "sheet";
@@ -22,7 +23,7 @@ internal class XlsxWorkbook : IWorkbook<XlsxWorksheet>
         private const string AttributeSheetId = "sheetId";
         private const string AttributeVisibleState = "state";
         private const string AttributeName = "name";
-        private const string AttributeRelationshipId = "r:id";
+        private const string AttributeRelationshipId = "id";
 
         private const string ElementRelationship = "Relationship";
         private const string ElementRelationships = "Relationships";
@@ -179,7 +180,7 @@ private void ReadSheets(XmlReader reader)
                     Sheets.Add(new XlsxBoundSheet(
                         reader.GetAttribute(AttributeName),
                         int.Parse(reader.GetAttribute(AttributeSheetId)),
-                        reader.GetAttribute(AttributeRelationshipId),
+                        reader.GetAttribute(AttributeRelationshipId, NsDocumentRelationship),
                         reader.GetAttribute(AttributeVisibleState)));
                     reader.Skip();
                 }

diff --git a/src/ExcelDataReader/ExcelDataReader.csproj b/src/ExcelDataReader/ExcelDataReader.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Lightweight and fast library written in C# for reading Microsoft Excel files (2.0-2007).</Description>
     <AssemblyTitle>ExcelDataReader</AssemblyTitle>
-    <VersionPrefix>3.4.1</VersionPrefix>
+    <VersionPrefix>3.4.2</VersionPrefix>
     <Authors>ExcelDataReader developers</Authors>
     <TargetFrameworks>net20;net45;netstandard1.3;netstandard2.0</TargetFrameworks>
     <AssemblyName>ExcelDataReader</AssemblyName>

diff --git a/test/ExcelDataReader.Tests/Configuration.cs b/test/ExcelDataReader.Tests/Configuration.cs
@@ -176,6 +176,7 @@ internal static class Configuration
             { "Test_git_issue_324", "Test_git_issue_324.xlsx" },
             { "Test_git_issue_329_error.xlsx", "Test_git_issue_329_error.xlsx" },
             { "Test_git_issue_329_error.xls", "Test_git_issue_329_error.xls" },
+            { "test_git_issue_354.xlsx", "test_git_issue_354.xlsx" },
         };
 
         public static Stream GetTestWorkbook(string key)

diff --git a/test/ExcelDataReader.Tests/ExcelCsvReaderTest.cs b/test/ExcelDataReader.Tests/ExcelCsvReaderTest.cs
@@ -323,5 +323,25 @@ public void GitIssue_333_EAN_Quotes()
                 Assert.AreEqual(24, reader.FieldCount);
             }
         }
+        [Test]
+        public void GitIssue_351_Last_Line_Without_Line_Feed()
+        {
+            using (var strm = new MemoryStream())
+            {
+                using (var writer = new StreamWriter(strm, Encoding.UTF8))
+                {
+                    writer.NewLine = "\n";
+                    writer.WriteLine("5;6;1;Test");
+                    writer.Write("Test;;;");
+                    writer.Flush();
+                    using (var reader = ExcelReaderFactory.CreateCsvReader(strm))
+                    {
+                        var ds = reader.AsDataSet();
+                        Assert.AreEqual(2, ds.Tables[0].Rows.Count);
+                        Assert.AreEqual(4, reader.FieldCount);
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/test/ExcelDataReader.Tests/ExcelOpenXmlReaderTest.cs b/test/ExcelDataReader.Tests/ExcelOpenXmlReaderTest.cs
@@ -1511,5 +1511,17 @@ public void GitIssue_329_Error()
                 Assert.AreEqual(1, reader.RowCount);
             }
         }
+
+        [TestMethod]
+        public void GitIssue_354()
+        {
+            using (var reader = ExcelReaderFactory.CreateOpenXmlReader(Configuration.GetTestWorkbook("test_git_issue_354.xlsx")))
+            {
+                var result = reader.AsDataSet().Tables[0];
+
+                Assert.AreEqual(1, result.Rows.Count);
+                Assert.AreEqual("cell data", result.Rows[0][0]);
+            }
+        }
     }
 }
diff --git a/test/Resources/test_git_issue_354.xlsx b/test/Resources/test_git_issue_354.xlsx