Skip to content

Merge | SqlBuffer #3368

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 2 commits into from
May 23, 2025
Merged

Merge | SqlBuffer #3368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
630006b
Jam SqlBuffer.netfx components into SqlBuffer class in common project
benrr101 May 20, 2025
4d9843c
Class no longer needs to be partial
benrr101 May 20, 2025
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/netfx/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,6 @@
<ItemGroup>
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />
<Compile Include="Microsoft\Data\Common\DbConnectionString.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlBuffer.netfx.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlClientWrapperSmiStream.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlClientWrapperSmiStreamChars.cs" />
Expand Down
32 changes: 0 additions & 32 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlBuffer.netfx.cs
View file
Open in desktop

This file was deleted.

26 changes: 25 additions & 1 deletion src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBuffer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

namespace Microsoft.Data.SqlClient
{
internal sealed partial class SqlBuffer
internal sealed class SqlBuffer
{
internal enum StorageType
{
Expand Down Expand Up @@ -1238,6 +1238,17 @@ internal void Clear()
_object = null;
}

#if NETFRAMEWORK
internal void SetToDate(DateTime date)
{
Debug.Assert(IsEmpty, "setting value a second time?");

_type = StorageType.Date;
_value._int32 = date.Subtract(DateTime.MinValue).Days;
_isNull = false;
}
#endif

internal void SetToDateTime(int daypart, int timepart)
{
Debug.Assert(IsEmpty, "setting value a second time?");
Expand All @@ -1246,6 +1257,19 @@ internal void SetToDateTime(int daypart, int timepart)
_type = StorageType.DateTime;
_isNull = false;
}

#if NETFRAMEWORK
internal void SetToDateTime2(DateTime dateTime, byte scale)
{
Debug.Assert(IsEmpty, "setting value a second time?");

_type = StorageType.DateTime2;
_value._dateTime2Info._timeInfo._ticks = dateTime.TimeOfDay.Ticks;
_value._dateTime2Info._timeInfo._scale = scale;
_value._dateTime2Info._date = dateTime.Subtract(DateTime.MinValue).Days;
_isNull = false;
}
#endif

internal void SetToDecimal(byte precision, byte scale, bool positive, int[] bits)
{
Expand Down
Loading