Skip to content

Commit a47fe3e

Browse files
committed
More tweaks
1 parent a93b82e commit a47fe3e

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

src/EFCore.SqlServer/Query/Internal/Translators/SqlServerDateTimeMemberTranslator.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public class SqlServerDateTimeMemberTranslator(
7070

7171
nameof(DateTimeOffset.DateTime)
7272
when declaringType == typeof(DateTimeOffset)
73+
&& instance!.TypeMapping is { StoreTypeNameBase: "datetimeoffset" }
7374
=> sqlExpressionFactory.Function(
7475
"CONVERT",
7576
[sqlExpressionFactory.Fragment("datetime2"), instance!],
@@ -80,6 +81,7 @@ public class SqlServerDateTimeMemberTranslator(
8081

8182
nameof(DateTimeOffset.UtcDateTime)
8283
when declaringType == typeof(DateTimeOffset)
84+
&& instance!.TypeMapping is { StoreTypeNameBase: "datetimeoffset" }
8385
=> sqlExpressionFactory.Function(
8486
"CONVERT",
8587
[
@@ -99,6 +101,7 @@ public class SqlServerDateTimeMemberTranslator(
99101

100102
nameof(DateTimeOffset.LocalDateTime)
101103
when declaringType == typeof(DateTimeOffset)
104+
&& instance!.TypeMapping is { StoreTypeNameBase: "datetimeoffset" }
102105
=> sqlExpressionFactory.Function(
103106
"CONVERT",
104107
[

test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/DateOnlyTranslationsSqlServerTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public override async Task ToDateTime_with_complex_TimeOnly()
219219
AssertSql();
220220
}
221221

222-
[ConditionalFact]
222+
[ConditionalFact, SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
223223
public virtual async Task DateTrunc_year()
224224
{
225225
await AssertQueryScalar(
@@ -233,7 +233,7 @@ FROM [BasicTypesEntities] AS [b]
233233
""");
234234
}
235235

236-
[ConditionalFact]
236+
[ConditionalFact, SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
237237
public virtual async Task DateTrunc_month()
238238
{
239239
await AssertQueryScalar(

test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/DateTimeOffsetTranslationsSqlServerTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ WHERE CONVERT(datetime2, [b].[DateTimeOffset] AT TIME ZONE 'UTC') = '1998-05-04T
207207
""");
208208
}
209209

210-
[SqlServerCondition(SqlServerCondition.SupportsFunctions2019)]
210+
[SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
211211
public override async Task LocalDateTime()
212212
{
213213
await base.LocalDateTime();

test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/DateTimeTranslationsSqlServerTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ WHERE GETUTCDATE() > '2025-01-01T00:00:00.000'
271271
""");
272272
}
273273

274-
[ConditionalFact]
274+
[ConditionalFact, SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
275275
public virtual async Task DateTrunc_day()
276276
{
277277
await AssertQueryScalar(
@@ -285,7 +285,7 @@ FROM [BasicTypesEntities] AS [b]
285285
""");
286286
}
287287

288-
[ConditionalFact]
288+
[ConditionalFact, SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
289289
public virtual async Task DateTrunc_hour()
290290
{
291291
await AssertQueryScalar(

test/EFCore.SqlServer.FunctionalTests/Query/Translations/Temporal/TimeOnlyTranslationsSqlServerTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ ORDER BY CAST([b].[TimeSpan] AS time)
218218
""");
219219
}
220220

221-
[ConditionalFact]
221+
[ConditionalFact, SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
222222
public virtual async Task DateTrunc_hour()
223223
{
224224
await AssertQueryScalar(
@@ -232,7 +232,7 @@ FROM [BasicTypesEntities] AS [b]
232232
""");
233233
}
234234

235-
[ConditionalFact]
235+
[ConditionalFact, SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
236236
public virtual async Task DateTrunc_minute()
237237
{
238238
await AssertQueryScalar(

0 commit comments

Comments
 (0)