fix tests

Author: KirillKurdyukov

src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Query/GearsOfWarQueryYdbFixture.cs

@@ -20,14 +20,18 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
 
         modelBuilder.Entity<Mission>()
             .Property(e => e.Date)
-            .HasConversion(
-                v => v.ToDateTime(TimeOnly.MinValue),
-                v => DateOnly.FromDateTime(v));
+            .HasColumnType("Date32");
 
         modelBuilder.Entity<Mission>()
-            .Property(e => e.Duration)
+            .Property(e => e.Time)
+            .HasColumnType("Datetime64")
             .HasConversion(
-                v => new DateTime(1970, 1, 1).Add(v),
-                v => v.TimeOfDay);
+                v => new DateTime(2000, 1, 1).Add(v.ToTimeSpan()), // Time → DateTime
+                v => new TimeOnly(v.TimeOfDay.Ticks)
+            ); // DateTime → Time
+
+        modelBuilder.Entity<CogTag>()
+            .Property(e => e.IssueDate)
+            .HasColumnType("Date32");
     }
 }

src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Query/TPCGearsOfWarQueryYdbFixture.cs

@@ -16,17 +16,19 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
         base.OnModelCreating(modelBuilder, context);
 
         modelBuilder.Entity<Mission>()
-            .Property(e => e.Time)
-            .HasConversion(
-                v => new DateTime(2000, 1, 1).Add(v.ToTimeSpan()), // Time → DateTime
-                v => new TimeOnly(v.TimeOfDay.Ticks)) // DateTime → Time
-            .HasColumnType("DATETIME");
+            .Property(e => e.Date)
+            .HasColumnType("Date32");
 
         modelBuilder.Entity<Mission>()
-            .Property(e => e.Duration)
+            .Property(e => e.Time)
+            .HasColumnType("Datetime64")
             .HasConversion(
-                v => new DateTime(2000, 1, 1).Add(v), // TimeSpan → DateTime
-                v => v.TimeOfDay) // DateTime → TimeSpan
-            .HasColumnType("DATETIME");
+                v => new DateTime(2000, 1, 1).Add(v.ToTimeSpan()), // Time → DateTime
+                v => new TimeOnly(v.TimeOfDay.Ticks)
+            ); // DateTime → Time
+        
+        modelBuilder.Entity<CogTag>()
+            .Property(e => e.IssueDate)
+            .HasColumnType("Date32");
     }
 }

src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Query/TPTGearsOfWarQueryYdbFixture.cs

@@ -6,7 +6,7 @@
 
 namespace EntityFrameworkCore.Ydb.FunctionalTests.Query;
 
-public class TptGearsOfWarQueryYdbFixture : TPTGearsOfWarQueryRelationalFixture
+public class TPTGearsOfWarQueryYdbFixture : TPTGearsOfWarQueryRelationalFixture
 {
     protected override ITestStoreFactory TestStoreFactory
         => YdbTestStoreFactory.Instance;
@@ -16,17 +16,19 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
         base.OnModelCreating(modelBuilder, context);
 
         modelBuilder.Entity<Mission>()
-            .Property(e => e.Time)
-            .HasConversion(
-                v => new DateTime(2000, 1, 1).Add(v.ToTimeSpan()), // Time → DateTime
-                v => new TimeOnly(v.TimeOfDay.Ticks)) // DateTime → Time
-            .HasColumnType("DATETIME");
+            .Property(e => e.Date)
+            .HasColumnType("Date32");
 
         modelBuilder.Entity<Mission>()
-            .Property(e => e.Date)
+            .Property(e => e.Time)
+            .HasColumnType("Datetime64")
             .HasConversion(
-                v => new DateTime(v.Year, v.Month, v.Day), // DateOnly → DateTime
-                v => new DateOnly(v.Year, v.Month, v.Day)) // DateTime → DateOnly
-            .HasColumnType("DATETIME");
+                v => new DateTime(2000, 1, 1).Add(v.ToTimeSpan()), // Time → DateTime
+                v => new TimeOnly(v.TimeOfDay.Ticks)
+            ); // DateTime → Time
+                
+        modelBuilder.Entity<CogTag>()
+            .Property(e => e.IssueDate)
+            .HasColumnType("Date32");
     }
 }

src/EFCore.Ydb/test/EntityFrameworkCore.Ydb.FunctionalTests/Query/TPTGearsOfWarQueryYdbTest.cs

@@ -5,10 +5,10 @@
 namespace EntityFrameworkCore.Ydb.FunctionalTests.Query;
 
 // TODO: Correlated subqueries right now are not supported in YDB
-public class TptGearsOfWarQueryYdbTest : TPTGearsOfWarQueryRelationalTestBase<TptGearsOfWarQueryYdbFixture>
+public class TPTGearsOfWarQueryYdbTest : TPTGearsOfWarQueryRelationalTestBase<TPTGearsOfWarQueryYdbFixture>
 {
     // ReSharper disable once UnusedParameter.Local
-    public TptGearsOfWarQueryYdbTest(TptGearsOfWarQueryYdbFixture fixture, ITestOutputHelper testOutputHelper)
+    public TPTGearsOfWarQueryYdbTest(TPTGearsOfWarQueryYdbFixture fixture, ITestOutputHelper testOutputHelper)
         : base(fixture)
     {
         Fixture.TestSqlLoggerFactory.Clear();

src/Ydb.Sdk/src/Ado/Internal/YdbValueExtensions.cs

@@ -143,7 +143,7 @@ internal static Guid UnpackUuid(this Ydb.Value value)
     }
 
     internal static Ydb.Value PackDate(DateTime value) =>
-        new() { Uint32Value = (uint)(value.Subtract(DateTime.UnixEpoch).Ticks / TimeSpan.TicksPerDay) };
+        new() { Uint32Value = checked((uint)(value.Subtract(DateTime.UnixEpoch).Ticks / TimeSpan.TicksPerDay)) };
 
     internal static DateTime UnpackDate(this Ydb.Value value) =>
         UnixEpoch.AddTicks(value.Uint32Value * TimeSpan.TicksPerDay);
@@ -155,7 +155,7 @@ internal static DateTime UnpackDate32(this Ydb.Value value) =>
         UnixEpoch.AddTicks(value.Int32Value * TimeSpan.TicksPerDay);
 
     internal static Ydb.Value PackDatetime(DateTime value) => new()
-        { Uint32Value = (uint)(value.Subtract(DateTime.UnixEpoch).Ticks / TimeSpan.TicksPerSecond) };
+        { Uint32Value = checked((uint)(value.Subtract(DateTime.UnixEpoch).Ticks / TimeSpan.TicksPerSecond)) };
 
     internal static DateTime UnpackDatetime(this Ydb.Value value) =>
         UnixEpoch.AddTicks(value.Uint32Value * TimeSpan.TicksPerSecond);
@@ -167,7 +167,7 @@ internal static DateTime UnpackDatetime64(this Ydb.Value value) =>
         UnixEpoch.AddTicks(value.Int64Value * TimeSpan.TicksPerSecond);
 
     internal static Ydb.Value PackTimestamp(DateTime value) => new()
-        { Uint64Value = (ulong)(value.Ticks - DateTime.UnixEpoch.Ticks) / TimeSpanUtils.TicksPerMicrosecond };
+        { Uint64Value = checked((ulong)(value.Ticks - DateTime.UnixEpoch.Ticks) / TimeSpanUtils.TicksPerMicrosecond) };
 
     internal static DateTime UnpackTimestamp(this Ydb.Value value) =>
         UnixEpoch.AddTicks((long)(value.Uint64Value * TimeSpanUtils.TicksPerMicrosecond));