Fixing issue 584

Author: michelebastione

src/MiniExcel/OpenXml/ExcelOpenXmlSheetWriter.cs

@@ -195,20 +195,21 @@ private int WriteValues(MiniExcelStreamWriter writer, object values)
             }
             var maxColumnIndex = props.Count;
             int maxRowIndex;
+            var maxColumnIndex = props.Count(x => x != null && !x.ExcelIgnore);
 
             writer.Write(WorksheetXml.StartWorksheetWithRelationship);
 
             long dimensionPlaceholderPostition = 0;
 
             // We can write the dimensions directly if the row count is known
-            if (_configuration.FastMode && !isKnownCount)
+            if (isKnownCount)
             {
-                dimensionPlaceholderPostition = WriteDimensionPlaceholder(writer);
+                maxRowIndex = _printHeader ? count + 1 : count;
+                writer.Write(WorksheetXml.Dimension(GetDimensionRef(maxRowIndex, maxColumnIndex)));
             }
-            else if (isKnownCount)
+            else if (_configuration.FastMode)
             {
-                maxRowIndex = count + (_printHeader ? 1 : 0);
-                writer.Write(WorksheetXml.Dimension(GetDimensionRef(maxRowIndex, props.Count)));
+                dimensionPlaceholderPostition = WriteDimensionPlaceholder(writer);
             }
 
             //sheet view
@@ -219,7 +220,7 @@ private int WriteValues(MiniExcelStreamWriter writer, object values)
             long columnWidthsPlaceholderPosition = 0;
             if (_configuration.EnableAutoWidth)
             {
-                columnWidthsPlaceholderPosition = WriteColumnWidthPlaceholders(writer, props);
+                columnWidthsPlaceholderPosition = WriteColumnWidthPlaceholders(writer, maxColumnIndex);
                 widths = new ExcelWidthCollection(_configuration.MinWidth, _configuration.MaxWidth, props);
             }
             else
@@ -270,10 +271,10 @@ private int WriteValues(MiniExcelStreamWriter writer, object values)
             return maxRowIndex - toSubtract;
         }
 
-        private static long WriteColumnWidthPlaceholders(MiniExcelStreamWriter writer, ICollection<ExcelColumnInfo> props)
+        private static long WriteColumnWidthPlaceholders(MiniExcelStreamWriter writer, int count)
         {
             var placeholderPosition = writer.Flush();
-            writer.WriteWhitespace(WorksheetXml.GetColumnPlaceholderLength(props.Count));
+            writer.WriteWhitespace(WorksheetXml.GetColumnPlaceholderLength(count));
             return placeholderPosition;
         }
 
@@ -315,14 +316,15 @@ private void PrintHeader(MiniExcelStreamWriter writer, List<ExcelColumnInfo> pro
 
             foreach (var p in props)
             {
-                if (p == null)
+                //reason : https://github.com/mini-software/MiniExcel/issues/142
+                if (p != null)
                 {
-                    xIndex++; //reason : https://github.com/mini-software/MiniExcel/issues/142
-                    continue;
+                    if (p.ExcelIgnore)
+                        continue;
+                            
+                    var r = ExcelOpenXmlUtils.ConvertXyToCell(xIndex, yIndex);
+                    WriteCell(writer, r, columnName: p.ExcelColumnName);
                 }
-
-                var r = ExcelOpenXmlUtils.ConvertXyToCell(xIndex, yIndex);
-                WriteCell(writer, r, columnName: p.ExcelColumnName);
                 xIndex++;
             }
 

src/MiniExcel/Utils/CustomPropertyHelper.cs

@@ -346,16 +346,20 @@ internal static ExcelColumnInfo GetColumnInfosFromDynamicConfiguration(string co
             var dynamicColumn = configuration.DynamicColumns
                 .SingleOrDefault(col => string.Equals(col.Key, columnName, StringComparison.OrdinalIgnoreCase));
 
-            if (dynamicColumn == null || dynamicColumn.Ignore)
+            if (dynamicColumn == null)
                 return prop;
 
             prop.Nullable = true;
             prop.ExcelIgnore = dynamicColumn.Ignore;
             prop.ExcelColumnType = dynamicColumn.Type;
-            prop.ExcelColumnIndex = dynamicColumn.Index;
             prop.ExcelColumnWidth = dynamicColumn.Width;
             prop.CustomFormatter = dynamicColumn.CustomFormatter;
 
+            if (dynamicColumn.Index > -1)
+            {
+                prop.ExcelColumnIndex = dynamicColumn.Index;
+            }
+            
             if (dynamicColumn.Format != null)
             {
                 prop.ExcelFormat = dynamicColumn.Format;

src/MiniExcel/WriteAdapter/DataReaderWriteAdapter.cs

@@ -64,16 +64,17 @@ public IEnumerable<IEnumerable<CellWriteInfo>> GetRows(List<ExcelColumnInfo> pro
 
         private IEnumerable<CellWriteInfo> GetRowValues(List<ExcelColumnInfo> props)
         {
-            for (int i = 0, column = 1; i < _reader.FieldCount; i++, column++)
+            var column = 1;
+            for (int i = 0; i < _reader.FieldCount; i++)
             {
-                if (_configuration.DynamicColumnFirst)
+                var prop = props[i];
+                if (prop != null && !prop.ExcelIgnore)
                 {
-                    var columnIndex = _reader.GetOrdinal(props[i].Key.ToString());
-                    yield return new CellWriteInfo(_reader.GetValue(columnIndex), column, props[i]);
-                }
-                else
-                {
-                    yield return new CellWriteInfo(_reader.GetValue(i), column, props[i]);
+                    var columnIndex = _configuration.DynamicColumnFirst 
+                        ? _reader.GetOrdinal(prop.Key.ToString()) : i;
+                    
+                    yield return new CellWriteInfo(_reader.GetValue(columnIndex), column, prop);
+                    column++;
                 }
             }
         }

tests/MiniExcelTests/MiniExcelIssueTests.cs

@@ -3659,7 +3659,43 @@ public void Issue527()
         Assert.Equal("General User", rows[1].B);
         Assert.Equal("General Administrator", rows[2].B);
     }
-    
+
+    [Fact]
+    public void TestIssue584()
+    {
+        var excelconfig = new OpenXmlConfiguration
+        {
+            FastMode = true,
+            DynamicColumns =
+            [
+                new DynamicExcelColumn("Id") { Ignore = true }
+            ]
+        };
+
+        using var conn = Db.GetConnection();
+        conn.Open();
+        
+        using var cmd = conn.CreateCommand();
+        cmd.CommandText = 
+            """
+            WITH test('Id', 'Name') AS (
+                VALUES 
+                    (1, 'test1'), 
+                    (2, 'test2'), 
+                    (3, 'test3')
+                )
+            SELECT * FROM test;
+            """;
+        using var reader = cmd.ExecuteReader();
+
+        using var path = AutoDeletingPath.Create();
+        MiniExcel.SaveAs(path.FilePath, reader, configuration: excelconfig, overwriteFile: true);
+
+        var rows = MiniExcel.Query(path.FilePath).ToList();
+        Assert.All(rows, x => Assert.Single(x));
+        Assert.Equal("Name", rows[0].A);
+    }
+
     private class Issue585VO1
     {
         public string Col1 { get; set; }