Skip to content

Commit 9a92d74

Browse files
shps951023shps951023
committed
[Bug] Fixed QueryAsync not return dynamic type
1 parent 309d649 commit 9a92d74

File tree

6 files changed

+45
-30
lines changed

6 files changed

+45
-30
lines changed

‎docs/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616

1717
---
1818

19+
### 1.24.1
20+
- [Bug] Fiexd QueryAsync configulation not working #338
21+
- [Bug] Fixed QueryAsync not return dynamic type
22+
1923
### 1.24.0
2024
- [New] Query support strict open xml, thanks [Weilence (Lowell)](https://github.com/Weilence) #335
2125
- [New] SaveAs use the configured CultureInfo to write format cell value, thanks [0xced (Cédric Luthi)](https://github.com/0xced) #333

‎docs/README.zh-CN.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424

2525
---
2626

27+
### 1.24.1
28+
- [Bug] 修正 QueryAsync configulation 没有效果问题 #338
29+
- [Bug] 修正 QueryAsync 无法使用 dynamic 类别
30+
2731
### 1.24.0
2832
- [New] Query 支持 strict open xml, 感谢 [Weilence (Lowell)](https://github.com/Weilence) #335
2933
- [New] SaveAs 以自订的 CultureInfo 转换 Format cell 值, 感谢[0xced (Cédric Luthi)](https://github.com/0xced) #333

‎docs/README.zh-Hant.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@
1717

1818
---
1919

20+
21+
### 1.24.1
22+
- [Bug] 修正 QueryAsync configulation 沒有效果問題 #338
23+
- [Bug] 修正 QueryAsync 無法使用 dynamic 類別
24+
2025
### 1.24.0
26+
2127
- [New] Query 支持 strict open xml, 感謝 [Weilence (Lowell)](https://github.com/Weilence) #335
2228
- [New] SaveAs 以自訂的 CultureInfo 轉換 Format cell 值, 感謝[0xced (Cédric Luthi)](https://github.com/0xced) #333
2329
- [New] SaveAsByTemplate 預設忽略 template 缺少參數 key 錯誤, OpenXmlConfiguration.IgnoreTemplateParameterMissing 可以開關此卡控. #I4WXFB

‎tests/MiniExcelTests/MiniExcelIssueAsyncTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ public async Task Issue215()
798798
using (var stream = new MemoryStream())
799799
{
800800
stream.SaveAs(new[] { new { V = "test1" }, new { V = "test2" } });
801-
var q = await stream.QueryAsync(true);
801+
var q = (await stream.QueryAsync(true)).Cast<IDictionary<string,object>>();
802802
var rows = q.ToList();
803803
Assert.Equal("test1", rows[0]["V"]);
804804
Assert.Equal("test2", rows[1]["V"]);

‎tests/MiniExcelTests/MiniExcelOpenXmlAsyncTests.cs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public async Task CenterEmptyRowsQueryTest()
149149
var path = @"../../../../../samples/xlsx/TestCenterEmptyRow/TestCenterEmptyRow.xlsx";
150150
using (var stream = File.OpenRead(path))
151151
{
152-
var d = await stream.QueryAsync();
152+
var d = (await stream.QueryAsync()).Cast<IDictionary<string,object>>();
153153
var rows = d.ToList();
154154
Assert.Equal("a", rows[0]["A"]);
155155
Assert.Equal("b", rows[0]["B"]);
@@ -185,7 +185,7 @@ public async Task CenterEmptyRowsQueryTest()
185185

186186
using (var stream = File.OpenRead(path))
187187
{
188-
var d = await stream.QueryAsync(useHeaderRow: true);
188+
var d = (await stream.QueryAsync(useHeaderRow: true)).Cast<IDictionary<string, object>>();
189189
var rows = d.ToList();
190190
Assert.Equal(1d, rows[0]["a"]);
191191
Assert.Null(rows[0]["b"]);
@@ -220,7 +220,7 @@ public async Task TestDynamicQueryBasic_WithoutHead()
220220
var path = @"../../../../../samples/xlsx/TestDynamicQueryBasic_WithoutHead.xlsx";
221221
using (var stream = File.OpenRead(path))
222222
{
223-
var d= await stream.QueryAsync();
223+
var d= (await stream.QueryAsync()).Cast<IDictionary<string, object>>();
224224
var rows = d.ToList();
225225
Assert.Equal("MiniExcel", rows[0]["A"]);
226226
Assert.Equal(1d, rows[0]["B"]);
@@ -235,7 +235,7 @@ public async Task TestDynamicQueryBasic_useHeaderRow()
235235
var path = @"../../../../../samples/xlsx/TestDynamicQueryBasic.xlsx";
236236
using (var stream = File.OpenRead(path))
237237
{
238-
var d = await stream.QueryAsync(useHeaderRow: true);
238+
var d = (await stream.QueryAsync(useHeaderRow: true)).Cast<IDictionary<string, object>>();
239239
var rows = d.ToList();
240240
Assert.Equal("MiniExcel", rows[0]["Column1"]);
241241
Assert.Equal(1d, rows[0]["Column2"]);
@@ -329,7 +329,7 @@ public async Task TestDatetimeSpanFormat_ClosedXml()
329329
var path = @"../../../../../samples/xlsx/TestDatetimeSpanFormat_ClosedXml.xlsx";
330330
using (var stream = FileHelper.OpenRead(path))
331331
{
332-
var d = await stream.QueryAsync();
332+
var d = (await stream.QueryAsync()).Cast<IDictionary<string, object>>();
333333
var row = d.First();
334334
var a = row["A"];
335335
var b = row["B"];
@@ -399,7 +399,7 @@ public async Task QuerySheetWithoutRAttribute()
399399
var path = @"../../../../../samples/xlsx/TestWihoutRAttribute.xlsx";
400400
using (var stream = File.OpenRead(path))
401401
{
402-
var d = await stream.QueryAsync();
402+
var d = (await stream.QueryAsync()).Cast<IDictionary<string, object>>();
403403
var rows = d.ToList();
404404
var keys = (rows.First() as IDictionary<string, object>).Keys;
405405

@@ -455,7 +455,7 @@ public async Task SaveAsFileWithDimensionByICollection()
455455
{
456456
using (var stream = File.OpenRead(path))
457457
{
458-
var d = await stream.QueryAsync(useHeaderRow: false);
458+
var d = (await stream.QueryAsync(useHeaderRow: false)).Cast<IDictionary<string, object>>();
459459
var rows = d.ToList();
460460
Assert.Equal(3, rows.Count);
461461
Assert.Equal("A", rows[0]["A"]);
@@ -464,7 +464,7 @@ public async Task SaveAsFileWithDimensionByICollection()
464464
}
465465
using (var stream = File.OpenRead(path))
466466
{
467-
var d = await stream.QueryAsync(useHeaderRow: true);
467+
var d = (await stream.QueryAsync(useHeaderRow: true)).Cast<IDictionary<string, object>>();
468468
var rows = d.ToList();
469469
Assert.Equal(2, rows.Count);
470470
Assert.Equal("A", rows[0]["A"]);
@@ -524,7 +524,7 @@ public async Task SaveAsFileWithDimensionByICollection()
524524
{
525525
using (var stream = File.OpenRead(path))
526526
{
527-
var d = await stream.QueryAsync(useHeaderRow: false);
527+
var d = (await stream.QueryAsync(useHeaderRow: false)).Cast<IDictionary<string, object>>();
528528
var rows = d.ToList();
529529
Assert.Equal(3, rows.Count);
530530
Assert.Equal("A", rows[0]["A"]);
@@ -533,7 +533,7 @@ public async Task SaveAsFileWithDimensionByICollection()
533533
}
534534
using (var stream = File.OpenRead(path))
535535
{
536-
var d = await stream.QueryAsync(useHeaderRow: true);
536+
var d = (await stream.QueryAsync(useHeaderRow: true)).Cast<IDictionary<string, object>>();
537537
var rows = d.ToList();
538538
Assert.Equal(2, rows.Count);
539539
Assert.Equal("A", rows[0]["A"]);
@@ -598,7 +598,7 @@ public async Task SaveAsFileWithDimension()
598598
{
599599
using (var stream = File.OpenRead(path))
600600
{
601-
var d = await stream.QueryAsync(useHeaderRow: true);
601+
var d = (await stream.QueryAsync(useHeaderRow: true)).Cast<IDictionary<string, object>>();
602602
var rows = d.ToList();
603603
Assert.Equal(2, rows.Count);
604604
Assert.Equal(@"""<>+-*//}{\\n", rows[0]["a"]);
@@ -609,7 +609,7 @@ public async Task SaveAsFileWithDimension()
609609

610610
using (var stream = File.OpenRead(path))
611611
{
612-
var d= await stream.QueryAsync();
612+
var d= (await stream.QueryAsync()).Cast<IDictionary<string, object>>();
613613
var rows = d.ToList();
614614
Assert.Equal(3, rows.Count);
615615
Assert.Equal("a", rows[0]["A"]);
@@ -706,13 +706,13 @@ public async Task QueryByLINQExtensionsVoidTaskLargeFileOOMTest()
706706

707707
using (var stream = File.OpenRead(path))
708708
{
709-
var d = await stream.QueryAsync();
709+
var d = (await stream.QueryAsync()).Cast<IDictionary<string, object>>();
710710
var row = d.First();
711711
Assert.Equal("HelloWorld1", row["A"]);
712712
}
713713

714714
{
715-
var d = await MiniExcel.QueryAsync(path);
715+
var d = (await MiniExcel.QueryAsync(path)).Cast<IDictionary<string, object>>();
716716
var rows = d.Take(10);
717717
Assert.Equal(10, rows.Count());
718718
}
@@ -752,7 +752,7 @@ public async Task SaveAsByIEnumerableIDictionary()
752752

753753
using (var stream = File.OpenRead(path))
754754
{
755-
var d = await stream.QueryAsync(useHeaderRow: false);
755+
var d = (await stream.QueryAsync(useHeaderRow: false)).Cast<IDictionary<string, object>>();
756756
var rows = d.ToList();
757757
Assert.Equal("Column1", rows[0]["A"]);
758758
Assert.Equal("Column2", rows[0]["B"]);
@@ -764,7 +764,7 @@ public async Task SaveAsByIEnumerableIDictionary()
764764

765765
using (var stream = File.OpenRead(path))
766766
{
767-
var d = await stream.QueryAsync(useHeaderRow: true);
767+
var d = (await stream.QueryAsync(useHeaderRow: true)).Cast<IDictionary<string, object>>();
768768
var rows = d.ToList();
769769
Assert.Equal(2, rows.Count);
770770
Assert.Equal("MiniExcel", rows[0]["Column1"]);
@@ -814,7 +814,7 @@ public async Task SaveAsByDapperRows()
814814

815815
using (var stream = File.OpenRead(path))
816816
{
817-
var d = await stream.QueryAsync(useHeaderRow: true);
817+
var d = (await stream.QueryAsync(useHeaderRow: true)).Cast<IDictionary<string, object>>();
818818
var rows = d.ToList();
819819
Assert.Equal("MiniExcel", rows[0]["Column1"]);
820820
Assert.Equal(1d, rows[0]["Column2"]);
@@ -860,7 +860,7 @@ public async Task SaveAsByDapperRows()
860860

861861
using (var stream = File.OpenRead(path))
862862
{
863-
var d = await stream.QueryAsync(useHeaderRow: false);
863+
var d = (await stream.QueryAsync(useHeaderRow: false)).Cast<IDictionary<string, object>>();
864864
var rows = d.ToList();
865865
Assert.Equal("Column1", rows[0]["A"]);
866866
Assert.Equal("Column2", rows[0]["B"]);
@@ -872,7 +872,7 @@ public async Task SaveAsByDapperRows()
872872

873873
using (var stream = File.OpenRead(path))
874874
{
875-
var d = await stream.QueryAsync(useHeaderRow: true);
875+
var d = (await stream.QueryAsync(useHeaderRow: true)).Cast<IDictionary<string, object>>();
876876
var rows = d.ToList();
877877
Assert.Equal("MiniExcel", rows[0]["Column1"]);
878878
Assert.Equal(1d, rows[0]["Column2"]);
@@ -903,7 +903,7 @@ public async Task QueryByStrongTypeParameterTest()
903903

904904
using (var stream = File.OpenRead(path))
905905
{
906-
var d = await stream.QueryAsync(useHeaderRow: true);
906+
var d = (await stream.QueryAsync(useHeaderRow: true)).Cast<IDictionary<string, object>>();
907907
var rows = d.ToList();
908908
Assert.Equal("MiniExcel", rows[0]["Column1"]);
909909
Assert.Equal(1d, rows[0]["Column2"]);
@@ -929,7 +929,7 @@ public async Task QueryByDictionaryStringAndObjectParameterTest()
929929

930930
using (var stream = File.OpenRead(path))
931931
{
932-
var d = await stream.QueryAsync(useHeaderRow: true);
932+
var d = (await stream.QueryAsync(useHeaderRow: true)).Cast<IDictionary<string, object>>();
933933
var rows = d.ToList();
934934
Assert.Equal("MiniExcel", rows[0]["Column1"]);
935935
Assert.Equal(1d, rows[0]["Column2"]);
@@ -959,7 +959,7 @@ public async Task SQLiteInsertTest()
959959
using (var transaction = connection.BeginTransaction())
960960
using (var stream = File.OpenRead(path))
961961
{
962-
var rows = await stream.QueryAsync();
962+
var rows = (await stream.QueryAsync()).Cast<IDictionary<string, object>>();
963963
foreach (var row in rows)
964964
connection.Execute("insert into T (A,B) values (@A,@B)", new { A = row["A"],B = row["B"] }, transaction: transaction);
965965
transaction.Commit();
@@ -986,7 +986,7 @@ await MiniExcel.SaveAsAsync(path, new[] {
986986

987987
using (var stream = File.OpenRead(path))
988988
{
989-
var d = await stream.QueryAsync(useHeaderRow: true);
989+
var d = (await stream.QueryAsync(useHeaderRow: true)).Cast<IDictionary<string, object>>();
990990
var rows = d.ToList();
991991
Assert.Equal("MiniExcel", rows[0]["Column1"]);
992992
Assert.Equal(1d, rows[0]["Column2"]);
@@ -1015,7 +1015,7 @@ public async Task SaveAsBasicStreamTest()
10151015

10161016
using (var stream = File.OpenRead(path))
10171017
{
1018-
var d = await stream.QueryAsync(useHeaderRow: true);
1018+
var d = (await stream.QueryAsync(useHeaderRow: true)).Cast<IDictionary<string, object>>();
10191019
var rows = d.ToList();
10201020
Assert.Equal("MiniExcel", rows[0]["Column1"]);
10211021
Assert.Equal(1d, rows[0]["Column2"]);
@@ -1041,7 +1041,7 @@ public async Task SaveAsBasicStreamTest()
10411041

10421042
using (var stream = File.OpenRead(path))
10431043
{
1044-
var d = await stream.QueryAsync(useHeaderRow: true);
1044+
var d = (await stream.QueryAsync(useHeaderRow: true)).Cast<IDictionary<string, object>>();
10451045
var rows = d.ToList();
10461046
Assert.Equal("MiniExcel", rows[0]["Column1"]);
10471047
Assert.Equal(1d, rows[0]["Column2"]);

‎tests/MiniExcelTests/MiniExcelOpenXmlMultipleSheetAsyncTests.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System;
44
using System.IO;
55
using System.Threading.Tasks;
6+
using System.Collections.Generic;
67

78
namespace MiniExcelLibs.Tests
89
{
@@ -43,28 +44,28 @@ await Assert.ThrowsAsync<InvalidOperationException>(async() => {
4344
using (var stream = File.OpenRead(path))
4445
{
4546
{
46-
var q = await stream.QueryAsync(sheetName: "Sheet3");
47+
var q = (await stream.QueryAsync(sheetName: "Sheet3")).Cast<IDictionary<string, object>>();
4748
var rows = q.ToList();
4849
Assert.Equal(5, rows.Count);
4950
Assert.Equal(3d, rows[0]["A"]);
5051
Assert.Equal(3d, rows[0]["B"]);
5152
}
5253
{
53-
var q = await stream.QueryAsync(sheetName: "Sheet2");
54+
var q = (await stream.QueryAsync(sheetName: "Sheet2")).Cast<IDictionary<string, object>>();
5455
var rows = q.ToList();
5556
Assert.Equal(12, rows.Count);
5657
Assert.Equal(1d, rows[0]["A"]);
5758
Assert.Equal(1d, rows[0]["B"]);
5859
}
5960
{
60-
var q = await stream.QueryAsync(sheetName: "Sheet1");
61+
var q = (await stream.QueryAsync(sheetName: "Sheet1")).Cast<IDictionary<string, object>>();
6162
var rows = q.ToList();
6263
Assert.Equal(12, rows.Count);
6364
Assert.Equal(2d, rows[0]["A"]);
6465
Assert.Equal(2d, rows[0]["B"]);
6566
}
6667
{
67-
var q = await stream.QueryAsync(sheetName: "Sheet1");
68+
var q = (await stream.QueryAsync(sheetName: "Sheet1")).Cast<IDictionary<string, object>>();
6869
var rows = q.ToList();
6970
Assert.Equal(12, rows.Count);
7071
Assert.Equal(2d, rows[0]["A"]);

0 commit comments

Comments
 (0)