Skip to content

Merge | Align Task usage / ArrayPool / IsColumnEncryptionSupported netcore/netfx #2982

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
merged 14 commits into from
Nov 26, 2024
+195 −168
Merged

Merge | Align Task usage / ArrayPool / IsColumnEncryptionSupported netcore/netfx #2982

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6a9cd8c
Align IsColumnEncryptionSupported between netfx and netcore
MichelZ Nov 5, 2024
402be7c
Align code styles
MichelZ Nov 5, 2024
7d31e5a
Align variable order
MichelZ Nov 5, 2024
a816094
Align Task return
MichelZ Nov 5, 2024
0a7272f
Coding style alignments
MichelZ Nov 5, 2024
719c096
Align IsColumnEncryptionSupported between netfx and netcore
MichelZ Nov 5, 2024
a1b3820
Align code styles
MichelZ Nov 5, 2024
03b5413
Align variable order
MichelZ Nov 5, 2024
9625912
Align Task return
MichelZ Nov 5, 2024
efece9e
Coding style alignments
MichelZ Nov 5, 2024
e3200f1
Merge branch 'tdsparser-align-2' of https://github.com/MichelZ/SqlCli…
MichelZ Nov 6, 2024
f32dd03
Align Array renting netcore/netfx
MichelZ Nov 6, 2024
33dc557
Align more ArrayPool usages
MichelZ Nov 7, 2024
43a4fd6
Fix code review suggestions
MichelZ Nov 15, 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
31 changes: 13 additions & 18 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10449,15 +10449,15 @@ internal Task TdsExecuteRPC(SqlCommand cmd, IList<_SqlRPC> rpcArray, int timeout
String[] names = SqlParameter.ParseTypeName(param.UdtTypeName, isUdtTypeName: true);
if (!ADP.IsEmpty(names[0]) && TdsEnums.MAX_SERVERNAME < names[0].Length)
{
throw ADP.ArgumentOutOfRange("names");
throw ADP.ArgumentOutOfRange(nameof(names));
}
if (!ADP.IsEmpty(names[1]) && TdsEnums.MAX_SERVERNAME < names[names.Length - 2].Length)
{
throw ADP.ArgumentOutOfRange("names");
throw ADP.ArgumentOutOfRange(nameof(names));
}
if (TdsEnums.MAX_SERVERNAME < names[2].Length)
{
throw ADP.ArgumentOutOfRange("names");
throw ADP.ArgumentOutOfRange(nameof(names));
}

WriteUDTMetaData(value, names[0], names[1], names[2], stateObj);
Expand Down Expand Up @@ -10512,7 +10512,9 @@ internal Task TdsExecuteRPC(SqlCommand cmd, IList<_SqlRPC> rpcArray, int timeout
stateObj.WriteByte(TdsEnums.SQL70_DEFAULT_NUMERIC_PRECISION);
}
else
{
stateObj.WriteByte(precision);
}

stateObj.WriteByte(scale);
}
Expand Down Expand Up @@ -10898,7 +10900,6 @@ private void WriteParameterName(string rawParameterName, TdsParserStateObject st
}
}

private static readonly IEnumerable<Server.SqlDataRecord> __tvpEmptyValue = new List<Server.SqlDataRecord>().AsReadOnly();
private void WriteSmiParameter(SqlParameter param, int paramIndex, bool sendDefault, TdsParserStateObject stateObj, bool isAnonymous, bool advancedTraceIsOn)
{
//
Expand All @@ -10925,7 +10926,7 @@ private void WriteSmiParameter(SqlParameter param, int paramIndex, bool sendDefa
// Value for TVP default is empty list, not NULL
if (SqlDbType.Structured == metaData.SqlDbType && metaData.IsMultiValued)
{
value = __tvpEmptyValue;
value = Array.Empty<Server.SqlDataRecord>();
typeCode = ExtendedClrTypeCode.IEnumerableOfSqlDataRecord;
}
else
Expand Down Expand Up @@ -11949,25 +11950,25 @@ private int GetNotificationHeaderSize(SqlNotificationRequest notificationRequest

if (callbackId == null)
{
throw ADP.ArgumentNull("CallbackId");
throw ADP.ArgumentNull(nameof(callbackId));
}
else if (UInt16.MaxValue < callbackId.Length)
{
throw ADP.ArgumentOutOfRange("CallbackId");
throw ADP.ArgumentOutOfRange(nameof(callbackId));
}

if (service == null)
{
throw ADP.ArgumentNull("Service");
throw ADP.ArgumentNull(nameof(service));
}
else if (UInt16.MaxValue < service.Length)
{
throw ADP.ArgumentOutOfRange("Service");
throw ADP.ArgumentOutOfRange(nameof(service));
}

if (-1 > timeout)
{
throw ADP.ArgumentOutOfRange("Timeout");
throw ADP.ArgumentOutOfRange(nameof(timeout));
}

// Header Length (uint) (included in size) (already written to output buffer)
Expand Down Expand Up @@ -12551,14 +12552,8 @@ public override Task WriteAsync(byte[] buffer, int offset, int count, Cancellati
_parser.WriteInt(count, _stateObj); // write length of chunk
task = _stateObj.WriteByteArray(buffer, count, offset, canAccumulate: false);
}
if (task == null)
{
return Task.CompletedTask;
}
else
{
return task;
}

return task ?? Task.CompletedTask;
}
#if DEBUG
finally
Expand Down