tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-19 20:38:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 补充 Ado.ExecuteDataTable Columns 包含 DataType 信息；

Browse Source
This commit is contained in:
28810
2020-07-15 11:49:36 +08:00
parent 309f70f02f
commit 58240836bf
20 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs
View File

@ -675,7 +675,7 @@ namespace FreeSql.Internal.CommonProvider
{
var name = dr.GetName(a);
if (dt.Columns.Contains(name)) name = $"{name}_{Guid.NewGuid().ToString("N").Substring(0, 4)}";
dt.Columns.Add(name);
dt.Columns.Add(name, dr.GetFieldType(a));
}
}
object[] values = new object[dt.Columns.Count];
@ -699,7 +699,7 @@ namespace FreeSql.Internal.CommonProvider
{
var name = dr.GetName(a);
if (ret.Columns.Contains(name)) name = $"{name}_{Guid.NewGuid().ToString("N").Substring(0, 4)}";
ret.Columns.Add(name);
ret.Columns.Add(name, dr.GetFieldType(a));
}
object[] values = new object[ret.Columns.Count];
dr.GetValues(values);

4
FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderAsync.cs
View File

@ -598,7 +598,7 @@ namespace FreeSql.Internal.CommonProvider
{
var name = dr.GetName(a);
if (dt.Columns.Contains(name)) name = $"{name}_{Guid.NewGuid().ToString("N").Substring(0, 4)}";
dt.Columns.Add(name);
dt.Columns.Add(name, dr.GetFieldType(a));
}
}
object[] values = new object[dt.Columns.Count];
@ -622,7 +622,7 @@ namespace FreeSql.Internal.CommonProvider
{
var name = dr.GetName(a);
if (ret.Columns.Contains(name)) name = $"{name}_{Guid.NewGuid().ToString("N").Substring(0, 4)}";
ret.Columns.Add(name);
ret.Columns.Add(name, dr.GetFieldType(a));
}
object[] values = new object[ret.Columns.Count];
for (int a = 0; a < values.Length; a++) if (!await dr.IsDBNullAsync(a)) values[a] = await dr.GetFieldValueAsync<object>(a);