Set precision and scale of temp tables and scalar collections with decimals to 38,18

Author: PawelGerr

samples/Thinktecture.EntityFrameworkCore.Benchmarks/Database/SqlServerBenchmarkDbContext.cs

@@ -7,13 +7,6 @@ public SqlServerBenchmarkDbContext(DbContextOptions<SqlServerBenchmarkDbContext>
    {
    }
 
-   /// <inheritdoc />
-   protected override void ConfigureConventions(ModelConfigurationBuilder configurationBuilder)
-   {
-      configurationBuilder.Properties<decimal>(builder => builder
-                                                          .HavePrecision(18, 5));
-   }
-
    /// <inheritdoc />
    protected override void OnModelCreating(ModelBuilder modelBuilder)
    {

samples/Thinktecture.EntityFrameworkCore.SqlServer.Samples/Database/DemoDbContext.cs

@@ -21,13 +21,6 @@ public DemoDbContext(DbContextOptions<DemoDbContext> options, IDbDefaultSchema?
       Schema = schema?.Schema;
    }
 
-   /// <inheritdoc />
-   protected override void ConfigureConventions(ModelConfigurationBuilder configurationBuilder)
-   {
-      configurationBuilder.Properties<decimal>(builder => builder
-                                                          .HavePrecision(18, 5));
-   }
-
    /// <inheritdoc />
    protected override void OnModelCreating(ModelBuilder modelBuilder)
    {

src/Thinktecture.EntityFrameworkCore.BulkOperations/EntityFrameworkCore/BulkOperations/TempTableConvention.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Metadata.Conventions;
@@ -43,23 +44,41 @@ public void ProcessModelInitialized(IConventionModelBuilder modelBuilder, IConve
       AddTempTable<short?>(modelBuilder);
       AddTempTable<float>(modelBuilder);
       AddTempTable<float?>(modelBuilder);
-      AddTempTable<decimal>(modelBuilder);
-      AddTempTable<decimal?>(modelBuilder);
+      AddTempTable<decimal>(modelBuilder, (38, 18));
+      AddTempTable<decimal?>(modelBuilder, (38, 18));
       AddTempTable<TimeSpan>(modelBuilder);
       AddTempTable<TimeSpan?>(modelBuilder);
       AddTempTable<string>(modelBuilder);
    }
 
-   private static void AddTempTable<TColumn1>(IConventionModelBuilder modelBuilder)
+   private static void AddTempTable<TColumn1>(
+      IConventionModelBuilder modelBuilder,
+      (int Precision, int Scale)? precisionAndScale = null)
    {
       var type = typeof(TempTable<TColumn1>);
       var builder = modelBuilder.SharedTypeEntity(EntityNameProvider.GetTempTableName(type), type, fromDataAnnotation: true);
 
       if (builder is null)
          return;
 
+      if (precisionAndScale is not null)
+         SetScaleAndPrecision<TColumn1>(builder, precisionAndScale.Value);
+
       builder.ToTable($"#{type.ShortDisplayName()}");
       builder.HasNoKey();
       builder.ExcludeTableFromMigrations(true);
    }
+
+   private static void SetScaleAndPrecision<TColumn1>(
+      IConventionEntityTypeBuilder builder,
+      (int Precision, int Scale) precisionAndScale)
+   {
+      var propertyBuilder = builder.Property(typeof(TColumn1), nameof(TempTable<TColumn1>.Column1), fromDataAnnotation: true);
+
+      if (propertyBuilder is null)
+         return;
+
+      propertyBuilder.HasPrecision(precisionAndScale.Precision, true);
+      propertyBuilder.HasScale(precisionAndScale.Scale, true);
+   }
 }

src/Thinktecture.EntityFrameworkCore.SqlServer/EntityFrameworkCore/Parameters/SqlServerCollectionParameterConvention.cs

@@ -31,14 +31,16 @@ public void ProcessModelInitialized(IConventionModelBuilder modelBuilder, IConve
       AddScalarCollectionParameter<short?>(modelBuilder);
       AddScalarCollectionParameter<float>(modelBuilder);
       AddScalarCollectionParameter<float?>(modelBuilder);
-      AddScalarCollectionParameter<decimal>(modelBuilder);
-      AddScalarCollectionParameter<decimal?>(modelBuilder);
+      AddScalarCollectionParameter<decimal>(modelBuilder, (38, 18));
+      AddScalarCollectionParameter<decimal?>(modelBuilder, (38, 18));
       AddScalarCollectionParameter<TimeSpan>(modelBuilder);
       AddScalarCollectionParameter<TimeSpan?>(modelBuilder);
       AddScalarCollectionParameter<string>(modelBuilder);
    }
 
-   private static void AddScalarCollectionParameter<TColumn1>(IConventionModelBuilder modelBuilder)
+   private static void AddScalarCollectionParameter<TColumn1>(
+      IConventionModelBuilder modelBuilder,
+      (int Precision, int Scale)? precisionAndScale = null)
    {
       var builder = modelBuilder.SharedTypeEntity(EntityNameProvider.GetCollectionParameterName(typeof(TColumn1), true),
                                                   typeof(ScalarCollectionParameter<TColumn1>),
@@ -47,8 +49,24 @@ private static void AddScalarCollectionParameter<TColumn1>(IConventionModelBuild
       if (builder is null)
          return;
 
+      if (precisionAndScale is not null)
+         SetScaleAndPrecision<TColumn1>(builder, precisionAndScale.Value);
+
       builder.ToTable(typeof(ScalarCollectionParameter<TColumn1>).ShortDisplayName());
       builder.HasNoKey();
       builder.ExcludeTableFromMigrations(true);
    }
+
+   private static void SetScaleAndPrecision<TColumn1>(
+      IConventionEntityTypeBuilder builder,
+      (int Precision, int Scale) precisionAndScale)
+   {
+      var propertyBuilder = builder.Property(typeof(TColumn1), nameof(ScalarCollectionParameter<TColumn1>.Value), fromDataAnnotation: true);
+
+      if (propertyBuilder is null)
+         return;
+
+      propertyBuilder.HasPrecision(precisionAndScale.Precision, fromDataAnnotation: true);
+      propertyBuilder.HasScale(precisionAndScale.Scale, fromDataAnnotation: true);
+   }
 }

tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/Extensions/SqlServerOperationBuilderExtensionsTests/MigrationExtensionsTestDbContext.cs

@@ -9,13 +9,6 @@ public MigrationExtensionsTestDbContext(DbContextOptions<MigrationExtensionsTest
    {
    }
 
-   /// <inheritdoc />
-   protected override void ConfigureConventions(ModelConfigurationBuilder configurationBuilder)
-   {
-      configurationBuilder.Properties<decimal>(builder => builder
-                                                          .HavePrecision(18, 5));
-   }
-
    protected override void OnModelCreating(ModelBuilder modelBuilder)
    {
       base.OnModelCreating(modelBuilder);

tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/TestDatabaseContext/TestDbContext.cs

@@ -54,14 +54,6 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 
       Configure?.Invoke(optionsBuilder);
    }
-
-   /// <inheritdoc />
-   protected override void ConfigureConventions(ModelConfigurationBuilder configurationBuilder)
-   {
-      configurationBuilder.Properties<decimal>(builder => builder
-                                                  .HavePrecision(18, 5));
-   }
-
    protected override void OnModelCreating(ModelBuilder modelBuilder)
    {
       base.OnModelCreating(modelBuilder);