Use sheet iterator (fixes #96)

mganss · Jan 15, 2021 · 848ebbd · 848ebbd
1 parent e9bcc1f
commit 848ebbd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/ExcelMapper.Tests/Tests.cs b/ExcelMapper.Tests/Tests.cs
@@ -1892,5 +1892,19 @@ public void ColumnSkipTest()
             Assert.AreEqual("Nudossi", p.Name);
             Assert.AreEqual(60, p.Number);
         }
+
+        class NullProduct
+        {
+            public string Number { get; set; }
+            public string Color { get; set; }
+        }
+
+        [Test]
+        public void NullTest()
+        {
+            // see https://github.com/mganss/ExcelMapper/issues/96
+            var products = new ExcelMapper(@"..\..\..\null_test.xlsx").Fetch<NullProduct>().ToList();
+            Assert.AreEqual(20, products.Count);
+        }
     }
 }
diff --git a/ExcelMapper.Tests/null_test.xlsx b/ExcelMapper.Tests/null_test.xlsx
diff --git a/ExcelMapper/ExcelMapper.cs b/ExcelMapper/ExcelMapper.cs
@@ -410,15 +410,18 @@ IEnumerable Fetch(ISheet sheet, Type type, Func<string, object, object> valuePar
                 })
                 .Where(c => c.ColumnInfo?.Any() ?? false)
                 .ToDictionary(c => c.ColumnIndex, c => c.ColumnInfo);
-            var i = MinRowNumber;
-            IRow row = null;
 
             if (TrackObjects) Objects[sheet.SheetName] = new Dictionary<int, object>();
 
             var objInstanceIdx = 0;
 
-            while (i <= MaxRowNumber && (row = sheet.GetRow(i)) != null)
+            foreach (IRow row in sheet)
             {
+                var i = row.RowNum;
+
+                if (i < MinRowNumber) continue;
+                if (i > MaxRowNumber) break;
+
                 // optionally skip header row and blank rows
                 if ((!HeaderRow || i != HeaderRowNumber) && (!SkipBlankRows || row.Cells.Any(c => !IsCellBlank(c))))
                 {
@@ -458,8 +461,6 @@ IEnumerable Fetch(ISheet sheet, Type type, Func<string, object, object> valuePar
 
                     yield return o;
                 }
-
-                i++;
             }
         }