Skip to content

Fix | Write DateOnly instances to sql_variant columns of table-valued parameters as date values #4439

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

Open
edwardneal wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −20
Open

Fix | Write DateOnly instances to sql_variant columns of table-valued parameters as date values #4439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlRecordBuffer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ internal SmiMetaData VariantType
}
set
{
Debug.Assert(value != null && (value.SqlDbType == SqlDbType.Money || value.SqlDbType == SqlDbType.NVarChar),
Debug.Assert(value != null && (value.SqlDbType == SqlDbType.Money || value.SqlDbType == SqlDbType.NVarChar || value.SqlDbType == SqlDbType.Date),
"Invalid metadata");

_metadata = value;
Expand Down
13 changes: 10 additions & 3 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ValueUtilsSmi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1044,6 +1044,10 @@ internal static object GetSqlValue200(
result = GetSqlValue200(getters, ordinal, metaData);
break;
case SqlDbType.Date:
#if NET
result = DateOnly.FromDateTime(GetDateTime_Unchecked(getters, ordinal));
break;
#endif
case SqlDbType.DateTime2:
result = GetDateTime_Unchecked(getters, ordinal);
break;
Expand Down Expand Up @@ -1504,7 +1508,7 @@ value is DataFeed
}
#if NET
case ExtendedClrTypeCode.DateOnly:
SetDateTime_Checked(setters, ordinal, metaData, ((DateOnly)value).ToDateTime(new TimeOnly(0, 0)));
SetDate_Checked(setters, ordinal, metaData, ((DateOnly)value).ToDateTime(new TimeOnly(0, 0)));
break;
case ExtendedClrTypeCode.TimeOnly:
SetTimeSpan_Checked(setters, ordinal, metaData, ((TimeOnly)value).ToTimeSpan());
Expand Down Expand Up @@ -3135,8 +3139,11 @@ private static void SetDateTime2_Unchecked(ITypedSettersV3 setters, int ordinal,

private static void SetDate_Unchecked(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData, DateTime value)
{
Debug.Assert(metaData.SqlDbType == SqlDbType.Variant, "Invalid type. This should be called only when the type is variant.");
setters.SetVariantMetaData(ordinal, SmiMetaData.DefaultDate);
if (metaData.SqlDbType == SqlDbType.Variant)
{
setters.SetVariantMetaData(ordinal, SmiMetaData.DefaultDate);
}

setters.SetDateTime(ordinal, value);
}

Expand Down
19 changes: 3 additions & 16 deletions src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/DateTimeVariantTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

Expand Down Expand Up @@ -987,12 +987,7 @@ public static IEnumerable<object[]> GetParameterCombinations()
{
#if NET
yield return new object[] { DateOnly.MinValue, "date",
new Dictionary<TestVariations, ExceptionChecker> {
{ TestVariations.TestSimpleParameter_Variant, SqlDateTimeOverflow },
{ TestVariations.TestSqlDataRecordParameterToTVP_Variant, SqlDateTimeOverflow },
{ TestVariations.TestSqlDataReaderParameterToTVP_Variant, SqlDateTimeOverflow },
{ TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow },
{ TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }},
new Dictionary<TestVariations, ExceptionChecker>(),
new Dictionary<TestVariations, object>()
{
{ TestVariations.TestSimpleParameter_Type, new DateTime(0) },
Expand All @@ -1014,12 +1009,7 @@ public static IEnumerable<object[]> GetParameterCombinations()
},
new Dictionary<TestVariations, string>()};
yield return new object[] { DateOnly.MaxValue, "date",
new Dictionary<TestVariations, ExceptionChecker> {
{ TestVariations.TestSimpleParameter_Variant, SqlDateTimeOverflow },
{ TestVariations.TestSqlDataRecordParameterToTVP_Variant, SqlDateTimeOverflow },
{ TestVariations.TestSqlDataReaderParameterToTVP_Variant, SqlDateTimeOverflow },
{ TestVariations.SqlBulkCopyDataTable_Variant, SqlDateTimeOverflow },
{ TestVariations.SqlBulkCopyDataRow_Variant, SqlDateTimeOverflow }},
new Dictionary<TestVariations, ExceptionChecker>(),
new Dictionary<TestVariations, object>()
{
{ TestVariations.TestSimpleParameter_Type, new DateTime(3155378112000000000) },
Expand All @@ -1040,9 +1030,6 @@ public static IEnumerable<object[]> GetParameterCombinations()
{ TestVariations.SqlBulkCopyDataRow_Variant, new DateTime(3155378112000000000) }
},
new Dictionary<TestVariations, string>()
{
{TestVariations.TestSqlDataRecordParameterToTVP_Variant, "datetime"}
}
};
#endif
yield return new object[] { DateTime.MinValue, "date",
Expand Down
Loading