Skip to content

Fix | Allow writing DateOnly instance as a Variant parameter #4294

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
+115 −1
Open

Fix | Allow writing DateOnly instance as a Variant parameter #4294

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
18 changes: 18 additions & 0 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7845,6 +7845,12 @@ internal Task WriteSqlVariantValue(object value, int length, int offset, TdsPars
WriteDateTimeOffset((DateTimeOffset)value, mt.Scale, length, stateObj);
break;

#if NET
case TdsEnums.SQLDATE:
WriteDate((DateOnly)value, stateObj);
break;
#endif

default:
Debug.Fail("unknown tds type for sqlvariant!");
break;
Expand Down Expand Up @@ -8016,6 +8022,13 @@ internal Task WriteSqlVariantDataRowValue(object value, TdsParserStateObject sta
WriteDateTimeOffset((DateTimeOffset)value, metatype.Scale, 10, stateObj);
break;

#if NET
case TdsEnums.SQLDATE:
WriteSqlVariantHeader(5, metatype.TDSType, metatype.PropBytes, stateObj);
WriteDate((DateOnly)value, stateObj);
break;
#endif

default:
Debug.Fail("unknown tds type for sqlvariant!");
break;
Expand Down Expand Up @@ -8189,6 +8202,11 @@ private void WriteDate(DateTime value, TdsParserStateObject stateObj)
WritePartialLong(days, 3, stateObj);
}

#if NET
private void WriteDate(DateOnly value, TdsParserStateObject stateObj) =>
WritePartialLong(value.DayNumber, 3, stateObj);
#endif

private byte[] SerializeTime(TimeSpan value, byte scale, int length)
{
if (0 > value.Ticks || value.Ticks >= TimeSpan.TicksPerDay)
Expand Down
98 changes: 97 additions & 1 deletion 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
Expand Up @@ -406,6 +406,12 @@ public void TestSqlDataReader_TVP_Type(
{
value = ((TimeSpan)paramValue).ToString();
}
#if NET
else if (paramValue.GetType() == typeof(DateOnly))
{
value = ((DateOnly)paramValue).ToString();
}
#endif
else
{
value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
Expand Down Expand Up @@ -475,6 +481,12 @@ public void TestSqlDataReader_TVP_Variant(
{
value = ((TimeSpan)paramValue).ToString();
}
#if NET
else if (paramValue.GetType() == typeof(DateOnly))
{
value = ((DateOnly)paramValue).ToString();
}
#endif
else
{
value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
Expand Down Expand Up @@ -541,6 +553,12 @@ public void TestSimpleDataReader_Type(
{
value = ((TimeSpan)paramValue).ToString();
}
#if NET
else if (paramValue.GetType() == typeof(DateOnly))
{
value = ((DateOnly)paramValue).ToString();
}
#endif
else
{
value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
Expand Down Expand Up @@ -592,6 +610,12 @@ public void TestSimpleDataReader_Variant(
{
value = ((TimeSpan)paramValue).ToString();
}
#if NET
else if (paramValue.GetType() == typeof(DateOnly))
{
value = ((DateOnly)paramValue).ToString();
}
#endif
else
{
value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
Expand Down Expand Up @@ -644,6 +668,12 @@ public void SqlBulkCopySqlDataReader_Type(
{
value = ((TimeSpan)paramValue).ToString();
}
#if NET
else if (paramValue.GetType() == typeof(DateOnly))
{
value = ((DateOnly)paramValue).ToString();
}
#endif
else
{
value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
Expand Down Expand Up @@ -711,6 +741,12 @@ public void SqlBulkCopySqlDataReader_Variant(
{
value = ((TimeSpan)paramValue).ToString();
}
#if NET
else if (paramValue.GetType() == typeof(DateOnly))
{
value = ((DateOnly)paramValue).ToString();
}
#endif
else
{
value = ((DateTime)paramValue).ToString("M/d/yyyy") + " " + ((DateTime)paramValue).TimeOfDay;
Expand Down Expand Up @@ -948,6 +984,66 @@ public void SqlBulkCopyDataRow_Variant(
/// </summary>
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, object>()
{
{ TestVariations.TestSimpleParameter_Type, new DateTime(0) },
{ TestVariations.TestSimpleParameter_Variant, new DateTime(0) },
{ TestVariations.TestSqlDataRecordParameterToTVP_Type, new DateTime(0) },
{ TestVariations.TestSqlDataRecordParameterToTVP_Variant, new DateTime(0) },
{ TestVariations.TestSqlDataReaderParameterToTVP_Type, new DateTime(0) },
{ TestVariations.TestSqlDataReaderParameterToTVP_Variant, new DateTime(0) },
{ TestVariations.TestSqlDataReader_TVP_Type, new DateTime(0) },
{ TestVariations.TestSqlDataReader_TVP_Variant, new DateTime(0) },
{ TestVariations.TestSimpleDataReader_Type, new DateTime(0) },
{ TestVariations.TestSimpleDataReader_Variant, new DateTime(0) },
{ TestVariations.SqlBulkCopySqlDataReader_Type, new DateTime(0) },
{ TestVariations.SqlBulkCopySqlDataReader_Variant, new DateTime(0) },
{ TestVariations.SqlBulkCopyDataTable_Type, new DateTime(0) },
{ TestVariations.SqlBulkCopyDataTable_Variant, new DateTime(0) },
{ TestVariations.SqlBulkCopyDataRow_Type, new DateTime(0) },
{ TestVariations.SqlBulkCopyDataRow_Variant, new DateTime(0) }
},
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, object>()
{
{ TestVariations.TestSimpleParameter_Type, new DateTime(3155378112000000000) },
{ TestVariations.TestSimpleParameter_Variant, new DateTime(3155378112000000000) },
{ TestVariations.TestSqlDataRecordParameterToTVP_Type, new DateTime(3155378112000000000) },
{ TestVariations.TestSqlDataRecordParameterToTVP_Variant, new DateTime(3155378112000000000) },
{ TestVariations.TestSqlDataReaderParameterToTVP_Type, new DateTime(3155378112000000000) },
{ TestVariations.TestSqlDataReaderParameterToTVP_Variant, new DateTime(3155378112000000000) },
{ TestVariations.TestSqlDataReader_TVP_Type, new DateTime(3155378112000000000) },
{ TestVariations.TestSqlDataReader_TVP_Variant, new DateTime(3155378112000000000) },
{ TestVariations.TestSimpleDataReader_Type, new DateTime(3155378112000000000) },
{ TestVariations.TestSimpleDataReader_Variant, new DateTime(3155378112000000000) },
{ TestVariations.SqlBulkCopySqlDataReader_Type, new DateTime(3155378112000000000) },
{ TestVariations.SqlBulkCopySqlDataReader_Variant, new DateTime(3155378112000000000) },
{ TestVariations.SqlBulkCopyDataTable_Type, new DateTime(3155378112000000000) },
{ TestVariations.SqlBulkCopyDataTable_Variant, new DateTime(3155378112000000000) },
{ TestVariations.SqlBulkCopyDataRow_Type, new DateTime(3155378112000000000) },
{ TestVariations.SqlBulkCopyDataRow_Variant, new DateTime(3155378112000000000) }
},
new Dictionary<TestVariations, string>()
{
{TestVariations.TestSqlDataRecordParameterToTVP_Variant, "datetime"}
}
};
#endif
yield return new object[] { DateTime.MinValue, "date",
new Dictionary<TestVariations, ExceptionChecker> {
{ TestVariations.TestSimpleParameter_Variant, SqlDateTimeOverflow },
Expand Down Expand Up @@ -1069,7 +1165,7 @@ public static IEnumerable<object[]> GetParameterCombinations()
new Dictionary<TestVariations, ExceptionChecker>(),
new Dictionary<TestVariations, object>(),
new Dictionary<TestVariations, string>()};
yield return new object[] { DateTimeOffset.Parse("12/31/1999 23:59:59.9999999 -08:30"), "datetimeoffset",
yield return new object[] { DateTimeOffset.Parse("1999-12-31 23:59:59.9999999 -08:30"), "datetimeoffset",
new Dictionary<TestVariations, ExceptionChecker>(),
new Dictionary<TestVariations, object>(),
new Dictionary<TestVariations, string>()};
Expand Down
Loading