Fix type mapping for GETDATE and GETUTCDATE in SqlServer.

Author: cincuranet

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

@@ -69,8 +69,19 @@ public class SqlServerDateTimeMemberTranslator(
                     returnType),
 
             nameof(DateTime.Now)
+                when declaringType == typeof(DateTime)
                 => sqlExpressionFactory.Function(
-                    declaringType == typeof(DateTime) ? "GETDATE" : "SYSDATETIMEOFFSET",
+                    "GETDATE",
+                    arguments: [],
+                    nullable: false,
+                    argumentsPropagateNullability: [],
+                    returnType,
+                    typeMappingSource.FindMapping(typeof(DateTime), "datetime")),
+
+            nameof(DateTime.Now)
+                when declaringType == typeof(DateTimeOffset)
+                => sqlExpressionFactory.Function(
+                    "SYSDATETIMEOFFSET",
                     arguments: [],
                     nullable: false,
                     argumentsPropagateNullability: [],
@@ -83,7 +94,8 @@ public class SqlServerDateTimeMemberTranslator(
                     arguments: [],
                     nullable: false,
                     argumentsPropagateNullability: [],
-                    returnType),
+                    returnType,
+                    typeMappingSource.FindMapping(typeof(DateTime), "datetime")),
 
             nameof(DateTime.UtcNow)
                 when declaringType == typeof(DateTimeOffset)

test/EFCore.SqlServer.FunctionalTests/Query/AdHocMiscellaneousQuerySqlServerTest.cs

@@ -586,7 +586,7 @@ protected class ReproEntity13118
 
     #region 14095
 
-    [ConditionalTheory, InlineData(false), InlineData(true)]
+    [ConditionalTheory, MemberData(nameof(IsAsyncData))]
     public async Task Where_equals_DateTime_Now(bool async)
     {
         var contextFactory = await InitializeAsync<Context14095>(seed: c => c.SeedAsync());
@@ -611,7 +611,7 @@ FROM [Dates] AS [d]
 """);
     }
 
-    [ConditionalTheory, InlineData(false), InlineData(true)]
+    [ConditionalTheory, MemberData(nameof(IsAsyncData))]
     public async Task Where_not_equals_DateTime_Now(bool async)
     {
         var contextFactory = await InitializeAsync<Context14095>(seed: c => c.SeedAsync());
@@ -636,7 +636,7 @@ FROM [Dates] AS [d]
 """);
     }
 
-    [ConditionalTheory, InlineData(false), InlineData(true)]
+    [ConditionalTheory, MemberData(nameof(IsAsyncData))]
     public async Task Where_equals_new_DateTime(bool async)
     {
         var contextFactory = await InitializeAsync<Context14095>(seed: c => c.SeedAsync());
@@ -668,7 +668,7 @@ FROM [Dates] AS [d]
 """);
     }
 
-    [ConditionalTheory, InlineData(false), InlineData(true)]
+    [ConditionalTheory, MemberData(nameof(IsAsyncData))]
     public async Task Where_contains_DateTime_literals(bool async)
     {
         var dateTimes = new[]
@@ -1003,7 +1003,7 @@ public class DatesAndPrunes14095
 
     #region 15518
 
-    [ConditionalTheory, InlineData(false), InlineData(true)]
+    [ConditionalTheory, MemberData(nameof(IsAsyncData))]
     public virtual async Task Nested_queries_does_not_cause_concurrency_exception_sync(bool tracking)
     {
         var contextFactory = await InitializeAsync<Context15518>(seed: c => c.SeedAsync());
@@ -2620,4 +2620,58 @@ FROM [TestEntities] AS [t]
 """);
         }
     }
+
+    #region 36479
+
+    [ConditionalTheory, MemberData(nameof(IsAsyncData))]
+    public async Task DateTime_Now_has_proper_type_mapping(bool async)
+    {
+        var contextFactory = await InitializeAsync<Context36479>();
+        using var context = contextFactory.CreateContext();
+
+        var query = context.Entities.Where(x => DateTime.Now > new DateTime(2025, 1, 1));
+
+        var result = async
+            ? await query.ToListAsync()
+            : query.ToList();
+
+        AssertSql(
+            """
+SELECT [e].[Id]
+FROM [Entities] AS [e]
+WHERE GETDATE() > '2025-01-01T00:00:00.000'
+""");
+    }
+
+    [ConditionalTheory, MemberData(nameof(IsAsyncData))]
+    public async Task DateTime_UtcNow_has_proper_type_mapping(bool async)
+    {
+        var contextFactory = await InitializeAsync<Context36479>();
+        using var context = contextFactory.CreateContext();
+
+        var query = context.Entities.Where(x => DateTime.UtcNow > new DateTime(2025, 1, 1));
+
+        var result = async
+            ? await query.ToListAsync()
+            : query.ToList();
+
+        AssertSql(
+            """
+SELECT [e].[Id]
+FROM [Entities] AS [e]
+WHERE GETUTCDATE() > '2025-01-01T00:00:00.000'
+""");
+    }
+
+    protected class Context36479(DbContextOptions options) : DbContext(options)
+    {
+        public DbSet<Entity> Entities { get; set; }
+
+        public class Entity
+        {
+            public int Id { get; set; }
+        }
+    }
+
+    #endregion
 }

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

@@ -18,7 +18,7 @@ public override async Task Now()
 
         AssertSql(
             """
-@myDatetime='2015-04-10T00:00:00.0000000'
+@myDatetime='2015-04-10T00:00:00.0000000' (DbType = DateTime)
 
 SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
 FROM [BasicTypesEntities] AS [b]
@@ -32,7 +32,7 @@ public override async Task UtcNow()
 
         AssertSql(
             """
-@myDatetime='2015-04-10T00:00:00.0000000'
+@myDatetime='2015-04-10T00:00:00.0000000' (DbType = DateTime)
 
 SELECT [b].[Id], [b].[Bool], [b].[Byte], [b].[ByteArray], [b].[DateOnly], [b].[DateTime], [b].[DateTimeOffset], [b].[Decimal], [b].[Double], [b].[Enum], [b].[FlagsEnum], [b].[Float], [b].[Guid], [b].[Int], [b].[Long], [b].[Short], [b].[String], [b].[TimeOnly], [b].[TimeSpan]
 FROM [BasicTypesEntities] AS [b]