Skip to content

Fix QueryAsDataTable can't read Excel with only header rows #647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shps951023 merged 2 commits into from
Aug 13, 2024
Merged

Fix QueryAsDataTable can't read Excel with only header rows #647

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f24082
Fixed an issue with QueryAsDataTable that only header rows cannot be …
izanhzh Aug 12, 2024
5588a4f
handling null value
izanhzh Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions src/MiniExcel/MiniExcel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,31 +184,35 @@ public static DataTable QueryAsDataTable(this Stream stream, bool useHeaderRow =

var dt = new DataTable(sheetName);
var first = true;
var rows = ExcelReaderFactory.GetProvider(stream, ExcelTypeHelper.GetExcelType(stream, excelType), configuration).Query(useHeaderRow, sheetName, startCell);
var rows = ExcelReaderFactory.GetProvider(stream, ExcelTypeHelper.GetExcelType(stream, excelType), configuration).Query(false, sheetName, startCell);

var keys = new List<string>();
var columnDict = new Dictionary<string, string>();
foreach (IDictionary<string, object> row in rows)
{
if (first)
{
foreach (var key in row.Keys)
foreach (var entry in row)
{
if (!string.IsNullOrEmpty(key)) // avoid #298 : Column '' does not belong to table
var columnName = useHeaderRow ? entry.Value?.ToString() : entry.Key;
if (!string.IsNullOrWhiteSpace(columnName)) // avoid #298 : Column '' does not belong to table
{
var column = new DataColumn(key, typeof(object)) { Caption = key };
var column = new DataColumn(columnName, typeof(object)) { Caption = columnName };
dt.Columns.Add(column);
keys.Add(key);
columnDict.Add(entry.Key, columnName);//same column name throw exception???
}
}

dt.BeginLoadData();
first = false;
if (useHeaderRow)
{
continue;
}
}

var newRow = dt.NewRow();
foreach (var key in keys)
foreach (var entry in columnDict)
{
newRow[key] = row[key]; //TODO: optimize not using string key
newRow[entry.Value] = row[entry.Key]; //TODO: optimize not using string key
}

dt.Rows.Add(newRow);
Expand Down