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

Clean: Modernize style in ValueUtilsSmi #1351

Merged
merged 5 commits into from
Feb 25, 2022
Merged

Clean: Modernize style in ValueUtilsSmi #1351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
003ec2d
fix rebase conflicts
Wraith2 Feb 23, 2022
5694c64
fix merge conflicts
Wraith2 Jan 19, 2022
295a8e2
fix smi renamed conflict
Wraith2 Jan 19, 2022
205f715
apply style rules and address feedback
Wraith2 Feb 23, 2022
b468ebe
corrections from removing length parameter
Wraith2 Feb 23, 2022
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
1 change: 0 additions & 1 deletion 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 @@ -9809,7 +9809,6 @@ private void WriteSmiParameter(SqlParameter param, int paramIndex, bool sendDefa
value,
typeCode,
param.Offset,
0 < param.Size ? param.Size : -1,
peekAhead);
}

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7608,7 +7608,7 @@ private SmiRequestExecutor SetUpSmiRequest(SqlInternalConnectionSmi innerConnect

if (innerConnection.Is2008OrNewer)
{
ValueUtilsSmi.SetCompatibleValueV200(EventSink, requestExecutor, index, requestMetaData[index], value, typeCode, param.Offset, param.Size, peekAheadValues[index]);
ValueUtilsSmi.SetCompatibleValueV200(EventSink, requestExecutor, index, requestMetaData[index], value, typeCode, param.Offset, peekAheadValues[index]);
}
else
{
Expand Down
353 changes: 158 additions & 195 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDataReaderSmi.cs
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion 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 @@ -10754,7 +10754,6 @@ private void WriteSmiParameter(SqlParameter param, int paramIndex, bool sendDefa
value,
typeCode,
param.Offset,
0 < param.Size ? param.Size : -1,
peekAhead);
}

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ public virtual int GetSqlValues(object[] values)
public virtual void SetDBNull(int ordinal)
{
ThrowIfInvalidOrdinal(ordinal);
ValueUtilsSmi.SetDBNull(_eventSink, _recordBuffer, ordinal, true);
ValueUtilsSmi.SetDBNull(_eventSink, _recordBuffer, ordinal);
}

/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml' path='docs/members[@name="SqlDataRecord"]/SetGuid/*' />
Expand Down
14 changes: 7 additions & 7 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ private Type GetFieldTypeFrameworkSpecific(int ordinal)
=> MetaType.GetMetaTypeFromSqlDbType(GetSqlMetaData(ordinal).SqlDbType, false).ClassType;

private object GetValueFrameworkSpecific(int ordinal)
=> ValueUtilsSmi.GetValue200(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal));
=> ValueUtilsSmi.GetValue200(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), null);
private object GetSqlValueFrameworkSpecific(int ordinal)
=> ValueUtilsSmi.GetSqlValue200(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal));
=> ValueUtilsSmi.GetSqlValue200(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), null);

private SqlBytes GetSqlBytesFrameworkSpecific(int ordinal)
=> ValueUtilsSmi.GetSqlBytes(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal));
=> ValueUtilsSmi.GetSqlBytes(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), null);

private SqlXml GetSqlXmlFrameworkSpecific(int ordinal)
=> ValueUtilsSmi.GetSqlXml(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal));
=> ValueUtilsSmi.GetSqlXml(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), null);

private SqlChars GetSqlCharsFrameworkSpecific(int ordinal)
=> ValueUtilsSmi.GetSqlChars(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal));
=> ValueUtilsSmi.GetSqlChars(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), null);
private int SetValuesFrameworkSpecific(params object[] values)
{
if (values == null)
Expand Down Expand Up @@ -60,7 +60,7 @@ private int SetValuesFrameworkSpecific(params object[] values)
// the validation loop and here, or if an invalid UDT was sent).
for (int i = 0; i < copyLength; i++)
{
ValueUtilsSmi.SetCompatibleValueV200(_eventSink, _recordBuffer, i, GetSmiMetaData(i), values[i], typeCodes[i], offset: 0, length: 0, peekAhead: null);
ValueUtilsSmi.SetCompatibleValueV200(_eventSink, _recordBuffer, i, GetSmiMetaData(i), values[i], typeCodes[i], offset: 0, peekAhead: null);
}

return copyLength;
Expand All @@ -80,7 +80,7 @@ private void SetValueFrameworkSpecific(int ordinal, object value)
throw ADP.InvalidCast();
}

ValueUtilsSmi.SetCompatibleValueV200(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value, typeCode, offset: 0, length: 0, peekAhead: null);
ValueUtilsSmi.SetCompatibleValueV200(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value, typeCode, offset: 0, peekAhead: null);
}

private void SetTimeSpanFrameworkSpecific(int ordinal, TimeSpan value)
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlDataRecord.netfx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ private int SetValuesFrameworkSpecific(params object[] values)
{
if (SmiVersion >= SmiContextFactory.Sql2008Version)
{
ValueUtilsSmi.SetCompatibleValueV200(_eventSink, _recordBuffer, i, GetSmiMetaData(i), values[i], typeCodes[i], offset: 0, length: 0, peekAhead: null);
ValueUtilsSmi.SetCompatibleValueV200(_eventSink, _recordBuffer, i, GetSmiMetaData(i), values[i], typeCodes[i], offset: 0, peekAhead: null);
}
else
{
Expand Down Expand Up @@ -119,7 +119,7 @@ private void SetValueFrameworkSpecific(int ordinal, object value)

if (SmiVersion >= SmiContextFactory.Sql2008Version)
{
ValueUtilsSmi.SetCompatibleValueV200(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value, typeCode, offset: 0, length: 0, peekAhead: null);
ValueUtilsSmi.SetCompatibleValueV200(_eventSink, _recordBuffer, ordinal, GetSmiMetaData(ordinal), value, typeCode, offset: 0, peekAhead: null);
}
else
{
Expand Down
Loading