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

Jump to bottom

LINQ: Fixes preserve DateTime.Kind when passing value to custom JsonConverter #3224

Merged
merged 13 commits into from
Jun 6, 2022
Merged

LINQ: Fixes preserve DateTime.Kind when passing value to custom JsonConverter #3224

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f79451e
LINQ: preserve DateTime.Kind when passing to custom JsonConverter
ccurrens May 26, 2022
f9c62b2
Add named parameter
ccurrens May 26, 2022
209d5a8
Add unit test
ccurrens May 26, 2022
4e6a4f7
Update test
ccurrens May 27, 2022
a8a4e02
Remove unused namespaces
ccurrens May 27, 2022
9d5da09
Merge branch 'master' into dates-in-linq
j82w May 27, 2022
b180b42
Merge branch 'master' into dates-in-linq
ealsur May 31, 2022
6339cb9
Merge branch 'master' into dates-in-linq
ealsur May 31, 2022
d87396b
Fix nit
ccurrens Jun 3, 2022
5044acd
Add emulator test
ccurrens Jun 3, 2022
63b6542
Merge branch 'master' into dates-in-linq
j82w Jun 3, 2022
cc2f590
Update test to not use timezones
ccurrens Jun 3, 2022
2aa8aaa
Merge branch 'master' into dates-in-linq
j82w Jun 3, 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
Prev Previous commit
Next Next commit
Update test to not use timezones
  • Loading branch information
@ccurrens
ccurrens committed Jun 3, 2022
commit cc2f590ef3077fb833d725e100d405d15d8c462a
8 changes: 4 additions & 4 deletions ...lineTest/TestBaseline/LinqTranslationBaselineTests.TestDateTimeJsonConverterTimezones.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@
<Result>
<Input>
<Description><![CDATA[IsoDateTimeConverter LocalTime = filter]]></Description>
<Expression><![CDATA[query.Where(doc => (doc.IsoTime == new DateTime(2016, 9, 13, 0, 0, 0, Local)))]]></Expression>
<Expression><![CDATA[query.Where(doc => (doc.IsoDateOnly == new DateTime(2016, 9, 13, 0, 0, 0, Local)))]]></Expression>
</Input>
<Output>
<SqlQuery><![CDATA[
SELECT VALUE root
FROM root
WHERE (root["IsoTime"] = "2016-09-13T00:00:00-04:00")]]></SqlQuery>
WHERE (root["IsoDateOnly"] = "2016-09-13")]]></SqlQuery>
</Output>
</Result>
<Result>
<Input>
<Description><![CDATA[IsoDateTimeConverter UniversalTime = filter]]></Description>
<Expression><![CDATA[query.Where(doc => (doc.IsoTime == new DateTime(2016, 9, 13, 0, 0, 0, Utc)))]]></Expression>
<Expression><![CDATA[query.Where(doc => (doc.IsoDateOnly == new DateTime(2016, 9, 13, 0, 0, 0, Utc)))]]></Expression>
</Input>
<Output>
<SqlQuery><![CDATA[
SELECT VALUE root
FROM root
WHERE (root["IsoTime"] = "2016-09-13T00:00:00Z")]]></SqlQuery>
WHERE (root["IsoDateOnly"] = "2016-09-13")]]></SqlQuery>
</Output>
</Result>
</Results>
25 changes: 22 additions & 3 deletions ...t.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/LinqTranslationBaselineTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ namespace Microsoft.Azure.Cosmos.Services.Management.Tests.LinqProviderTests
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using Newtonsoft.Json.Converters;
using BaselineTest;
Expand Down Expand Up @@ -134,6 +135,9 @@ internal class DataObject : LinqTestObject
[JsonConverter(typeof(IsoDateTimeConverter))]
public DateTime IsoTime;

[JsonConverter(typeof(DateJsonConverter))]
public DateTime IsoDateOnly;

// This field should serialize as ISO Date
// as this is the default DateTimeConverter
// used by Newtonsoft
Expand All @@ -145,6 +149,21 @@ internal class DataObject : LinqTestObject
public string Pk;
}

class DateJsonConverter : IsoDateTimeConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
if (value is DateTime dateTime)
{
writer.WriteValue(dateTime.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture));
}
else
{
base.WriteJson(writer, value, serializer);
}
}
}

internal class AmbientContextObject
{
public double FieldAccess;
Expand Down Expand Up @@ -358,7 +377,7 @@ public void TestDateTimeJsonConverterTimezones()
Func<Random, DataObject> createDataObj = (random) =>
{
DataObject obj = new() {
IsoTime = LinqTestsCommon.RandomDateTime(random, midDateTime),
IsoDateOnly = LinqTestsCommon.RandomDateTime(random, midDateTime),
Id = Guid.NewGuid().ToString(),
Pk = "Test"
};
Expand All @@ -368,8 +387,8 @@ public void TestDateTimeJsonConverterTimezones()

List<LinqTestInput> inputs = new()
{
new LinqTestInput("IsoDateTimeConverter LocalTime = filter", b => getQuery(b).Where(doc => doc.IsoTime == new DateTime(2016, 9, 13, 0, 0, 0, DateTimeKind.Local))),
new LinqTestInput("IsoDateTimeConverter UniversalTime = filter", b => getQuery(b).Where(doc => doc.IsoTime == new DateTime(2016, 9, 13, 0, 0, 0, DateTimeKind.Utc))),
new LinqTestInput("IsoDateTimeConverter LocalTime = filter", b => getQuery(b).Where(doc => doc.IsoDateOnly == new DateTime(2016, 9, 13, 0, 0, 0, DateTimeKind.Local))),
new LinqTestInput("IsoDateTimeConverter UniversalTime = filter", b => getQuery(b).Where(doc => doc.IsoDateOnly == new DateTime(2016, 9, 13, 0, 0, 0, DateTimeKind.Utc))),
};
this.ExecuteTestSuite(inputs);
}
Expand Down