Skip to content

Merge | Align TdsExecuteRPC between netcore and netfx #2985

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

Closed
wants to merge 6 commits into from
Closed

Merge | Align TdsExecuteRPC between netcore and netfx #2985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
54fa8ae
Factor out TDSExecuteRPCAddParameter for alignment with netcore
MichelZ Nov 26, 2024
2c79a54
Factor out TDSExecuteRPCParameterSetupFlushCompletion to align with n…
MichelZ Nov 26, 2024
816d078
Factor out TDSExecuteRPCParameterSetupWriteCompletion to align with n…
MichelZ Nov 26, 2024
a136062
Align connection lock release with netcore
MichelZ Nov 26, 2024
886c38f
Align Code styles, add MustSetUdtTypeNameForUdtParams check
MichelZ Nov 26, 2024
b589f11
Merge branch 'main' into merge-tdsparser-tdsexecuterpc
MichelZ Nov 26, 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
7 changes: 5 additions & 2 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
using Microsoft.Data.SqlClient.DataClassification;
using Microsoft.Data.SqlClient.Server;
using Microsoft.Data.SqlTypes;
using Microsoft.SqlServer.Server;

namespace Microsoft.Data.SqlClient
{
Expand Down Expand Up @@ -9790,11 +9791,13 @@ private Task TDSExecuteRPCAddParameter(TdsParserStateObject stateObj, SqlParamet
}
else if (mt.SqlDbType == SqlDbType.Udt)
{
byte[] udtVal = null;
Format format = Format.Native;

Debug.Assert(_is2005, "Invalid DataType UDT for non-2005 or later server!");

int maxSupportedSize = Is2008OrNewer ? int.MaxValue : short.MaxValue;
byte[] udtVal = null;
SqlServer.Server.Format format = SqlServer.Server.Format.Native;


if (string.IsNullOrEmpty(param.UdtTypeName))
{
Expand Down
Loading
Loading