Fix for temp tables having default values with ValueConverters

Author: PawelGerr

src/Thinktecture.EntityFrameworkCore.SqlServer/EntityFrameworkCore/TempTables/SqlServerTempTableCreator.cs

@@ -246,10 +246,20 @@ private string GetColumnsDefinitions(SqlServerTempTableCreatorCacheKey options)
             {
                sb.Append(" DEFAULT (").Append(defaultValueSql).Append(')');
             }
-            else if (property.Property.TryGetDefaultValue(storeObject.Value, out var defaultValue))
+            else if (property.Property.TryGetDefaultValue(storeObject.Value, out var defaultValue) && defaultValue is not null)
             {
-               var mappingForValue = _typeMappingSource.GetMappingForValue(defaultValue);
-               sb.Append(" DEFAULT ").Append(mappingForValue.GenerateSqlLiteral(defaultValue));
+               var converter = property.Property.GetValueConverter();
+
+               if (converter is not null)
+                  defaultValue = converter.ConvertToProvider(defaultValue);
+
+               if (defaultValue is not null)
+               {
+                  var mappingForValue = _typeMappingSource.FindMapping(defaultValue.GetType(), columnType)
+                                        ?? _typeMappingSource.GetMappingForValue(defaultValue);
+
+                  sb.Append(" DEFAULT ").Append(mappingForValue.GenerateSqlLiteral(defaultValue));
+               }
             }
 
             isFirst = false;

src/Thinktecture.EntityFrameworkCore.Sqlite/EntityFrameworkCore/TempTables/SqliteTempTableCreator.cs

@@ -133,10 +133,11 @@ private string GetColumnsDefinitions(SqliteTempTableCreatorCacheKey options)
 
             storeObject ??= property.GetStoreObject();
             var columnName = property.GetColumnName(storeObject.Value);
+            var columnType = property.Property.GetColumnType(storeObject.Value);
 
             sb.Append("\t\t")
               .Append(_sqlGenerationHelper.DelimitIdentifier(columnName)).Append(' ')
-              .Append(property.Property.GetColumnType(storeObject.Value))
+              .Append(columnType)
               .Append(property.Property.IsNullable ? " NULL" : " NOT NULL");
 
             if (property.Property.IsAutoIncrement())
@@ -157,10 +158,20 @@ private string GetColumnsDefinitions(SqliteTempTableCreatorCacheKey options)
             {
                sb.Append(" DEFAULT (").Append(defaultValueSql).Append(')');
             }
-            else if (property.Property.TryGetDefaultValue(storeObject.Value, out var defaultValue))
+            else if (property.Property.TryGetDefaultValue(storeObject.Value, out var defaultValue) && defaultValue is not null)
             {
-               var mappingForValue = _typeMappingSource.GetMappingForValue(defaultValue);
-               sb.Append(" DEFAULT ").Append(mappingForValue.GenerateSqlLiteral(defaultValue));
+               var converter = property.Property.GetValueConverter();
+
+               if (converter is not null)
+                  defaultValue = converter.ConvertToProvider(defaultValue);
+
+               if (defaultValue is not null)
+               {
+                  var mappingForValue = _typeMappingSource.FindMapping(defaultValue.GetType(), columnType)
+                                        ?? _typeMappingSource.GetMappingForValue(defaultValue);
+
+                  sb.Append(" DEFAULT ").Append(mappingForValue.GenerateSqlLiteral(defaultValue));
+               }
             }
 
             isFirst = false;

tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/EntityFrameworkCore/TempTables/SqlServerTempTableCreatorTests/CreateTempTableAsync.cs

@@ -560,6 +560,20 @@ public async Task Should_create_temp_table_with_string()
       ValidateColumn(columns[0], nameof(TempTable<string>.Column1), "nvarchar", false);
    }
 
+   [Fact]
+   public async Task Should_create_temp_table_with_converter_and_default_value()
+   {
+      ConfigureModel = builder => builder.ConfigureTempTable<ConvertibleClass>()
+                                         .Property(t => t.Column1)
+                                         .HasConversion(c => c.Key, k => new ConvertibleClass(k))
+                                         .HasDefaultValue(new ConvertibleClass(1));
+
+      await using var tempTable = await SUT.CreateTempTableAsync(ActDbContext.GetEntityType<TempTable<ConvertibleClass>>(), _optionsWithNonUniqueName);
+
+      var columns = AssertDbContext.GetTempTableColumns<TempTable<ConvertibleClass>>().ToList();
+      ValidateColumn(columns[0], nameof(TempTable<ConvertibleClass>.Column1), "int", false, defaultValue: "((1))");
+   }
+
    [Fact]
    public async Task Should_create_temp_table_with_string_with_max_length()
    {
@@ -694,13 +708,15 @@ private static void ValidateColumn(
       bool isNullable,
       byte? numericPrecision = null,
       int? numericScale = null,
-      int? charMaxLength = null)
+      int? charMaxLength = null,
+      string? defaultValue = null)
    {
       ArgumentNullException.ThrowIfNull(column);
 
       column.COLUMN_NAME.Should().Be(name);
       column.DATA_TYPE.Should().Be(type);
       column.IS_NULLABLE.Should().Be(isNullable ? "YES" : "NO");
+      column.COLUMN_DEFAULT.Should().Be(defaultValue);
 
       if (numericPrecision.HasValue)
          column.NUMERIC_PRECISION.Should().Be(numericPrecision.Value);

tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/EntityFrameworkCore/TempTables/SqliteTempTableCreatorTests/CreateTempTableAsync.cs

@@ -602,6 +602,20 @@ public async Task Should_create_temp_table_with_string()
       ValidateColumn(columns[0], nameof(TempTable<string>.Column1), "TEXT", false);
    }
 
+   [Fact]
+   public async Task Should_create_temp_table_with_converter_and_default_value()
+   {
+      ConfigureModel = builder => builder.ConfigureTempTable<ConvertibleClass>()
+                                         .Property(t => t.Column1)
+                                         .HasConversion(c => c.Key, k => new ConvertibleClass(k))
+                                         .HasDefaultValue(new ConvertibleClass(1));
+
+      await using var tempTable = await SUT.CreateTempTableAsync(ActDbContext.GetEntityType<TempTable<ConvertibleClass>>(), _optionsWithNonUniqueNameAndNoPrimaryKey);
+
+      var columns = AssertDbContext.GetTempTableColumns<TempTable<ConvertibleClass>>().ToList();
+      ValidateColumn(columns[0], nameof(TempTable<ConvertibleClass>.Column1), "INTEGER", false, "1");
+   }
+
    [Fact]
    public async Task Should_create_temp_table_with_string_with_max_length()
    {
@@ -714,12 +728,13 @@ public async Task Should_create_temp_table_for_entity_with_many_owned_types()
       ValidateColumn(columns[3], nameof(OwnedEntity.StringColumn), "TEXT", true);
    }
 
-   private static void ValidateColumn(SqliteTableInfo column, string name, string type, bool isNullable)
+   private static void ValidateColumn(SqliteTableInfo column, string name, string type, bool isNullable, string? defaultValue = null)
    {
       ArgumentNullException.ThrowIfNull(column);
 
       column.Name.Should().Be(name);
       column.Type.Should().Be(type);
       column.NotNull.Should().Be(isNullable ? 0 : 1);
+      column.Dflt_Value.Should().Be(defaultValue);
    }
 }

tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/TestDatabaseContext/SqliteTableInfo.cs

@@ -9,6 +9,6 @@ public class SqliteTableInfo
    public string? Name { get; set; }
    public string? Type { get; set; }
    public long? NotNull { get; set; }
-   public byte[]? Dflt_Value { get; set; }
+   public string? Dflt_Value { get; set; }
    public long? PK { get; set; }
-}
+}