checking

Author: LiamHamsters

src/EFCore.Ydb/src/Storage/Internal/YdbTypeMappingSource.cs

@@ -115,8 +115,7 @@ RelationalTypeMappingSourceDependencies relationalDependencies
 
     protected override RelationalTypeMapping? FindMapping(in RelationalTypeMappingInfo mappingInfo)
     {
-        if (mappingInfo.ClrType == typeof(decimal)
-            || (mappingInfo.StoreTypeName?.StartsWith("Decimal", StringComparison.OrdinalIgnoreCase) ?? false))
+        if (mappingInfo.ClrType == typeof(decimal))
         {
             return DecimalCache.GetOrAdd(mappingInfo, static mi => Decimal.Clone(mi));
         }

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

@@ -10,41 +10,5 @@ public class DecimalParameterQueryYdbFixture : SharedStoreFixtureBase<DecimalPar
 
     protected override ITestStoreFactory TestStoreFactory => YdbTestStoreFactory.Instance;
 
-    public override async Task InitializeAsync()
-    {
-        await base.InitializeAsync();
-
-        await using var context = CreateContext();
-        await context.Database.EnsureCreatedAsync();
-    }
-
-    public class TestContext(DbContextOptions options) : DbContext(options)
-    {
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            modelBuilder.Entity<ItemDefault>(b =>
-            {
-                b.HasKey(x => x.Id);
-                b.Property(x => x.Price);
-            });
-
-            modelBuilder.Entity<ItemExplicit>(b =>
-            {
-                b.HasKey(x => x.Id);
-                b.Property(x => x.Price).HasPrecision(22, 9);
-            });
-        }
-    }
-}
-
-public class ItemDefault
-{
-    public int Id { get; set; }
-    public decimal Price { get; set; }
-}
-
-public class ItemExplicit
-{
-    public int Id { get; set; }
-    public decimal Price { get; set; }
+    public class TestContext(DbContextOptions options) : DbContext(options);
 }

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

@@ -16,6 +16,7 @@ private DbContextOptions<ParametricDecimalContext> BuildOptions()
 
         return new DbContextOptionsBuilder<ParametricDecimalContext>()
             .UseYdb(cs)
+            .ReplaceService<IModelCacheKeyFactory, ParametricDecimalContext.CacheKeyFactory>()
             .Options;
     }
 
@@ -47,27 +48,37 @@ private DbContextOptions<ParametricDecimalContext> BuildOptions()
     private ParametricDecimalContext NewCtx(int p, int s)
         => new(BuildOptions(), p, s);
 
+    private static Task DropItemsTableAsync(DbContext ctx, int p, int s) =>
+        ctx.Database.ExecuteSqlRawAsync($"DROP TABLE IF EXISTS Items_{p}_{s}");
+
     [Theory]
     [MemberData(nameof(AdoLikeCases))]
     public async Task Decimal_roundtrips_or_rounds_like_ado(int p, int s, decimal value)
     {
         await using var ctx = NewCtx(p, s);
         await ctx.Database.EnsureCreatedAsync();
 
-        var e = new ParamItem { Price = value };
-        ctx.Add(e);
-        await ctx.SaveChangesAsync();
+        try
+        {
+            var e = new ParamItem { Price = value };
+            ctx.Add(e);
+            await ctx.SaveChangesAsync();
 
-        var got = await ctx.Items.AsNoTracking().SingleAsync(x => x.Id == e.Id);
+            var got = await ctx.Items.AsNoTracking().SingleAsync(x => x.Id == e.Id);
 
-        var expected = Math.Round(value, s, MidpointRounding.ToEven);
-        Assert.Equal(expected, got.Price);
+            var expected = Math.Round(value, s, MidpointRounding.ToEven);
+            Assert.Equal(expected, got.Price);
 
-        var tms = ctx.GetService<IRelationalTypeMappingSource>();
-        var et = ctx.Model.FindEntityType(typeof(ParamItem))!;
-        var prop = et.FindProperty(nameof(ParamItem.Price))!;
-        var mapping = tms.FindMapping(prop)!;
-        Assert.Equal($"Decimal({p}, {s})", mapping.StoreType);
+            var tms = ctx.GetService<IRelationalTypeMappingSource>();
+            var et = ctx.Model.FindEntityType(typeof(ParamItem))!;
+            var prop = et.FindProperty(nameof(ParamItem.Price))!;
+            var mapping = tms.FindMapping(prop)!;
+            Assert.Equal($"Decimal({p}, {s})", mapping.StoreType);
+        }
+        finally
+        {
+            await DropItemsTableAsync(ctx, p, s);
+        }
     }
 
     [Theory]
@@ -77,7 +88,14 @@ public async Task Decimal_overflow_bubbles_up(int p, int s, decimal value)
         await using var ctx = NewCtx(p, s);
         await ctx.Database.EnsureCreatedAsync();
 
-        ctx.Add(new ParamItem { Price = value });
-        await Assert.ThrowsAsync<DbUpdateException>(() => ctx.SaveChangesAsync());
+        try
+        {
+            ctx.Add(new ParamItem { Price = value });
+            await Assert.ThrowsAsync<DbUpdateException>(() => ctx.SaveChangesAsync());
+        }
+        finally
+        {
+            await DropItemsTableAsync(ctx, p, s);
+        }
     }
 }

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

@@ -1,4 +1,5 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace EntityFrameworkCore.Ydb.FunctionalTests.Query;
 
@@ -23,6 +24,15 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) =>
             b.HasKey(x => x.Id);
             b.Property(x => x.Price).HasPrecision(_p, _s);
         });
+
+    internal sealed class CacheKeyFactory : IModelCacheKeyFactory
+    {
+        public object Create(DbContext context, bool designTime)
+        {
+            var ctx = (ParametricDecimalContext)context;
+            return (context.GetType(), designTime, ctx._p, ctx._s);
+        }
+    }
 }
 
 public sealed class ParamItem