Skip to content
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

Add GetFieldValue(Async)<T> support for XmlReader, TextReader, Stream #1019

Merged
merged 13 commits into from
Oct 6, 2021
Merged

Add GetFieldValue(Async)<T> support for XmlReader, TextReader, Stream #1019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3f6d36a
add TextReader XmlReader and Stream to GetFieldValue(Async)
Wraith2 Mar 25, 2021
3a12c2a
make async mandatory for GetFieldValueFromSqlBufferInternal and pass …
Wraith2 Mar 29, 2021
290e673
fix async sequential null behaviour
Wraith2 Mar 31, 2021
3bd60f0
add netfx type workaround updates to match netcore
Wraith2 Mar 31, 2021
609d680
fix merge conflict
Wraith2 Aug 24, 2021
fd77237
fix merge conflict
Wraith2 Aug 24, 2021
e41b05c
address feedback
Wraith2 Jun 23, 2021
17569bc
Modify tests (#2)
cheenamalhotra Sep 29, 2021
8a6c14b
implement for netfx and enable tests
Wraith2 Sep 29, 2021
4eab8ec
add reliability section aronud internal read shortcut for netfx
Wraith2 Sep 29, 2021
9d5ace0
fix tiny typo with a big effect
Wraith2 Sep 30, 2021
b824b96
Add tests for the stream exceptions (#3)
DavoudEshtehari Oct 5, 2021
00422cf
Merge remote-tracking branch 'UpStream/main' into fix-asyncstreams
DavoudEshtehari Oct 6, 2021
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
12 changes: 8 additions & 4 deletions doc/snippets/Microsoft.Data.SqlClient/SqlDataReader.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,8 @@
<summary>Synchronously gets the value of the specified column as a type. <see cref="M:Microsoft.Data.SqlClient.SqlDataReader.GetFieldValueAsync``1(System.Int32,System.Threading.CancellationToken)" /> is the asynchronous version of this method.</summary>
<returns>The returned type object.</returns>
<remarks>
<format type="text/markdown"><![CDATA[
<format type="text/markdown">
<![CDATA[

## Remarks
`T` can be one of the following types:
Expand All @@ -332,7 +333,8 @@
|SqlBoolean|SqlByte|SqlDateTime|SqlDecimal|
|SqlDouble|SqlGuid|SqlInt16|SqlInt32|
|SqlInt64|SqlMoney|SqlSingle|SqlString|
|String|UDT, which can be any CLR type marked with <xref:Microsoft.Data.SqlClient.Server.SqlUserDefinedTypeAttribute>.|||
|Stream|String|TextReader|UDT, which can be any CLR type marked with <xref:Microsoft.Data.SqlClient.Server.SqlUserDefinedTypeAttribute>.|
|XmlReader||||

For more information, see [SqlClient Streaming Support](/sql/connect/ado-net/sqlclient-streaming-support).

Expand All @@ -359,7 +361,8 @@
<summary>Asynchronously gets the value of the specified column as a type. <see cref="M:Microsoft.Data.SqlClient.SqlDataReader.GetFieldValue``1(System.Int32)" /> is the synchronous version of this method.</summary>
<returns>The returned type object.</returns>
<remarks>
<format type="text/markdown"><![CDATA[
<format type="text/markdown">
<![CDATA[

## Remarks
`T` can be one of the following types:
Expand All @@ -372,7 +375,8 @@
|SqlBoolean|SqlByte|SqlDateTime|SqlDecimal|
|SqlDouble|SqlGuid|SqlInt16|SqlInt32|
|SqlInt64|SqlMoney|SqlSingle|SqlString|
|String|UDT, which can be any CLR type marked with <xref:Microsoft.Data.SqlClient.Server.SqlUserDefinedTypeAttribute>.|||
|Stream|String|TextReader|UDT, which can be any CLR type marked with <xref:Microsoft.Data.SqlClient.Server.SqlUserDefinedTypeAttribute>.|
|XmlReader||||

For more information, see [SqlClient Streaming Support](/sql/connect/ado-net/sqlclient-streaming-support).

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCachedBuffer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ internal SqlXml ToSqlXml()
[MethodImpl(MethodImplOptions.NoInlining)]
internal XmlReader ToXmlReader()
{
return SqlTypeWorkarounds.SqlXmlCreateSqlXmlReader(ToStream(), closeInput: false);
return SqlTypeWorkarounds.SqlXmlCreateSqlXmlReader(ToStream(), closeInput: false, async: false);
}

public bool IsNull
Expand Down
266 changes: 193 additions & 73 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlDataReader.cs
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 2 additions & 23 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCachedBuffer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
using System.Data.SqlTypes;
using System.Diagnostics;
using System.IO;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Xml;
using Microsoft.Data.SqlTypes;

namespace Microsoft.Data.SqlClient
{
Expand Down Expand Up @@ -134,26 +134,7 @@ internal SqlXml ToSqlXml()
[MethodImpl(MethodImplOptions.NoInlining)]
internal XmlReader ToXmlReader()
{
//XmlTextReader xr = new XmlTextReader(fragment, XmlNodeType.Element, null);
XmlReaderSettings readerSettings = new XmlReaderSettings();
readerSettings.ConformanceLevel = ConformanceLevel.Fragment;

// Call internal XmlReader.CreateSqlReader from System.Xml.
// Signature: internal static XmlReader CreateSqlReader(Stream input, XmlReaderSettings settings, XmlParserContext inputContext);
MethodInfo createSqlReaderMethodInfo = typeof(System.Xml.XmlReader).GetMethod("CreateSqlReader", BindingFlags.Static | BindingFlags.NonPublic);
object[] args = new object[3] { ToStream(), readerSettings, null };
XmlReader xr;

new System.Security.Permissions.ReflectionPermission(System.Security.Permissions.ReflectionPermissionFlag.MemberAccess).Assert();
try
{
xr = (XmlReader)createSqlReaderMethodInfo.Invoke(null, args);
}
finally
{
System.Security.Permissions.ReflectionPermission.RevertAssert();
}
return xr;
return SqlTypeWorkarounds.SqlXmlCreateSqlXmlReader(ToStream(), closeInput: false, async: false);
Wraith2 marked this conversation as resolved.
Show resolved Hide resolved
}

public bool IsNull
Expand All @@ -163,7 +144,5 @@ public bool IsNull
return (_cachedBytes == null) ? true : false;
}
}

}

}
Loading