#712 Added Settings.TrimCharFields option to TrimEnd() of 'char' fields. Thanks to Peterhup.

Author: sjh37

BuildTT/BuildTT.cs

@@ -108,6 +108,7 @@ private static void CreateTT(string generatorRoot, string ttRoot)
     Settings.IncludeQueryTraceOn9481Flag        = false; // If SqlServer 2014 appears frozen / take a long time when this file is saved, try setting this to true (you will also need elevated privileges).
     Settings.UsePrivateSetterForComputedColumns = true; // If the columns is computed, use a private setter.
     Settings.IncludeGeneratorVersionInCode      = false; // If true, will include the version number of the generator in the generated code
+    Settings.TrimCharFields                     = false; // EF Core option only. If true, will TrimEnd() 'char' fields when read from the database.
     Settings.AdditionalNamespaces               = new List<string>(); // To include extra namespaces, include them here. i.e. new List<string> { ""Microsoft.AspNetCore.Identity.EntityFrameworkCore"", ""System.ComponentModel.DataAnnotations"" };
     Settings.AdditionalContextInterfaceItems    = new List<string>(); // example: new List<string> { ""void SetAutoDetectChangesEnabled(bool flag);"" };
     Settings.AdditionalFileHeaderText           = new List<string>(); // This will put additional lines verbatim at the top of each file under the comments, 1 line per entry

EntityFramework.Reverse.POCO.Generator/Database NorthwindSqlCe40.tt

@@ -69,6 +69,7 @@
     Settings.AddParameterlessConstructorToDbContext = true; // EF6 only. If true, then DbContext will have a default (parameter-less) constructor which automatically passes in the connection string name, if false then no parameter-less constructor will be created.
     Settings.ConfigurationClassName                 = "Configuration"; // Configuration, Mapping, Map, etc. This is appended to the Poco class name to configure the mappings.
     Settings.DatabaseReaderPlugin                   = ""; // Eg, "c:\\Path\\YourDatabaseReader.dll,Full.Name.Of.Class.Including.Namespace". See #501. This will allow you to specify a pluggable provider for reading your database.
+    Settings.UseMappingTables                       = false; // Can only be true for TemplateType.Ef6 & TemplateType.EfCore5. If true, mapping will be used and no mapping tables will be generated. If false, all tables will be generated.
 
     Settings.EntityClassesModifiers        = "public"; // "public partial";
     Settings.ConfigurationClassesModifiers = "public"; // "public partial";
@@ -91,6 +92,7 @@
     Settings.IncludeQueryTraceOn9481Flag        = false; // If SqlServer 2014 appears frozen / take a long time when this file is saved, try setting this to true (you will also need elevated privileges).
     Settings.UsePrivateSetterForComputedColumns = true; // If the columns is computed, use a private setter.
     Settings.IncludeGeneratorVersionInCode      = false; // If true, will include the version number of the generator in the generated code
+    Settings.TrimCharFields                     = false; // EF Core option only. If true, will TrimEnd() 'char' fields when read from the database.
     Settings.AdditionalNamespaces               = new List<string>(); // To include extra namespaces, include them here. i.e. new List<string> { "Microsoft.AspNetCore.Identity.EntityFrameworkCore", "System.ComponentModel.DataAnnotations" };
     Settings.AdditionalContextInterfaceItems    = new List<string>(); // example: new List<string> { "void SetAutoDetectChangesEnabled(bool flag);" };
     Settings.AdditionalFileHeaderText           = new List<string>(); // This will put additional lines verbatim at the top of each file under the comments, 1 line per entry
@@ -347,6 +349,16 @@
         }
     };
 
+    // Writes any boilerplate stuff inside the POCO class body
+    Settings.WriteInsideClassBody = delegate(Table t)
+    {
+        // Example:
+        //return "    // " + t.NameHumanCase + Environment.NewLine;
+
+        // Do nothing by default
+        return string.Empty;
+    };
+
     // Using Views *****************************************************************************************************************
     // SQL Server does not support the declaration of primary-keys in VIEWs. Entity Framework's EDMX designer (and this generator)
     // assume that all non-null columns in a VIEW are primary-key columns, this will be incorrect for most non-trivial applications.
@@ -615,4 +627,4 @@
         generator.ReadDatabase();
         generator.GenerateCode();
     }
-    fileManagement.Process(true);#>
+    fileManagement.Process(true);#>

EntityFramework.Reverse.POCO.Generator/Database.tt

@@ -92,6 +92,7 @@
     Settings.IncludeQueryTraceOn9481Flag        = false; // If SqlServer 2014 appears frozen / take a long time when this file is saved, try setting this to true (you will also need elevated privileges).
     Settings.UsePrivateSetterForComputedColumns = true; // If the columns is computed, use a private setter.
     Settings.IncludeGeneratorVersionInCode      = false; // If true, will include the version number of the generator in the generated code
+    Settings.TrimCharFields                     = false; // EF Core option only. If true, will TrimEnd() 'char' fields when read from the database.
     Settings.AdditionalNamespaces               = new List<string>(); // To include extra namespaces, include them here. i.e. new List<string> { "Microsoft.AspNetCore.Identity.EntityFrameworkCore", "System.ComponentModel.DataAnnotations" };
     Settings.AdditionalContextInterfaceItems    = new List<string>(); // example: new List<string> { "void SetAutoDetectChangesEnabled(bool flag);" };
     Settings.AdditionalFileHeaderText           = new List<string>(); // This will put additional lines verbatim at the top of each file under the comments, 1 line per entry

EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.v3.ttinclude

@@ -86,6 +86,7 @@
         public static bool IncludeQueryTraceOn9481Flag              = false; // If SqlServer 2014 appears frozen / take a long time when this file is saved, try setting this to true (you will also need elevated privileges).
         public static bool UsePrivateSetterForComputedColumns       = true; // If the columns is computed, use a private setter.
         public static bool IncludeGeneratorVersionInCode            = false; // If true, will include the version number of the generator in the generated code
+        public static bool TrimCharFields                           = false; // EF Core option only. EF Core option only. If true, will TrimEnd() 'char' fields when read from the database.
         public static List<string> AdditionalNamespaces             = new List<string>(); // To include extra namespaces, include them here. i.e. "Microsoft.AspNet.Identity.EntityFramework"
         public static List<string> AdditionalContextInterfaceItems  = new List<string>(); //  example: "void SetAutoDetectChangesEnabled(bool flag);"
         public static List<string> AdditionalFileHeaderText         = new List<string>(); // This will put additional lines verbatim at the top of each file under the comments, 1 line per entry
@@ -5776,6 +5777,11 @@
                     else if (c.Precision > 0 && DatabaseReader.IsPrecisionType(c.SqlPropertyType))
                         sb.AppendFormat(".HasPrecision({0})", c.Precision);
                 }
+
+                if (Settings.TrimCharFields && c.MaxLength > 1 && c.SqlPropertyType == "char")
+                {
+                    sb.Append(".HasConversion(new ValueConverter<string, string>(v => v.TrimEnd(), v => v.TrimEnd()))");
+                }
             }
 
             sb.Append(c.IsNullable ? ".IsRequired(false)" : ".IsRequired()");
@@ -18815,6 +18821,9 @@ using {{this}};{{#newline}}
             if (Settings.IncludeCodeGeneratedAttribute)
                 usings.Add("System.CodeDom.Compiler");
 
+            if (Settings.TrimCharFields)
+                usings.Add("Microsoft.EntityFrameworkCore.Storage.ValueConversion");
+
             return usings;
         }
 
@@ -20271,6 +20280,9 @@ using {{this}};{{#newline}}
             if (Settings.IncludeCodeGeneratedAttribute)
                 usings.Add("System.CodeDom.Compiler");
 
+            if (Settings.TrimCharFields)
+                usings.Add("Microsoft.EntityFrameworkCore.Storage.ValueConversion");
+
             return usings;
         }
 
@@ -21704,6 +21716,9 @@ using {{this}};{{#newline}}
             if (Settings.IncludeCodeGeneratedAttribute)
                 usings.Add("System.CodeDom.Compiler");
 
+            if (Settings.TrimCharFields)
+                usings.Add("Microsoft.EntityFrameworkCore.Storage.ValueConversion");
+
             return usings;
         }
 

Generator/Generators/GeneratorEfCore.cs

@@ -121,6 +121,11 @@ protected override void SetupConfig(Column c)
                     else if (c.Precision > 0 && DatabaseReader.IsPrecisionType(c.SqlPropertyType))
                         sb.AppendFormat(".HasPrecision({0})", c.Precision);
                 }
+
+                if (Settings.TrimCharFields && c.MaxLength > 1 && c.SqlPropertyType == "char")
+                {
+                    sb.Append(".HasConversion(new ValueConverter<string, string>(v => v.TrimEnd(), v => v.TrimEnd()))");
+                }
             }
 
             sb.Append(c.IsNullable ? ".IsRequired(false)" : ".IsRequired()");

Generator/Settings.cs

@@ -60,6 +60,7 @@ public static class Settings
         public static bool IncludeQueryTraceOn9481Flag              = false; // If SqlServer 2014 appears frozen / take a long time when this file is saved, try setting this to true (you will also need elevated privileges).
         public static bool UsePrivateSetterForComputedColumns       = true; // If the columns is computed, use a private setter.
         public static bool IncludeGeneratorVersionInCode            = false; // If true, will include the version number of the generator in the generated code
+        public static bool TrimCharFields                           = false; // EF Core option only. EF Core option only. If true, will TrimEnd() 'char' fields when read from the database.
         public static List<string> AdditionalNamespaces             = new List<string>(); // To include extra namespaces, include them here. i.e. "Microsoft.AspNet.Identity.EntityFramework"
         public static List<string> AdditionalContextInterfaceItems  = new List<string>(); //  example: "void SetAutoDetectChangesEnabled(bool flag);"
         public static List<string> AdditionalFileHeaderText         = new List<string>(); // This will put additional lines verbatim at the top of each file under the comments, 1 line per entry

Generator/Templates/TemplateEfCore2.cs

@@ -1237,6 +1237,9 @@ public override List<string> PocoConfigurationUsings(PocoConfigurationModel data
             if (Settings.IncludeCodeGeneratedAttribute)
                 usings.Add("System.CodeDom.Compiler");
 
+            if (Settings.TrimCharFields)
+                usings.Add("Microsoft.EntityFrameworkCore.Storage.ValueConversion");
+
             return usings;
         }
 

Generator/Templates/TemplateEfCore3.cs

@@ -1343,6 +1343,9 @@ public override List<string> PocoConfigurationUsings(PocoConfigurationModel data
             if (Settings.IncludeCodeGeneratedAttribute)
                 usings.Add("System.CodeDom.Compiler");
 
+            if (Settings.TrimCharFields)
+                usings.Add("Microsoft.EntityFrameworkCore.Storage.ValueConversion");
+
             return usings;
         }
 

Generator/Templates/TemplateEfCore5.cs

@@ -1320,6 +1320,9 @@ public override List<string> PocoConfigurationUsings(PocoConfigurationModel data
             if (Settings.IncludeCodeGeneratedAttribute)
                 usings.Add("System.CodeDom.Compiler");
 
+            if (Settings.TrimCharFields)
+                usings.Add("Microsoft.EntityFrameworkCore.Storage.ValueConversion");
+
             return usings;
         }
 

Tester.Integration.EfCore3/Fred.cs

@@ -26,6 +26,7 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Query.Internal;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -71,6 +72,7 @@ public interface IFredDbContext : IDisposable
         DbSet<BringTheAction> BringTheActions { get; set; } // BringTheAction
         DbSet<Burak1> Burak1 { get; set; } // Burak1
         DbSet<Burak2> Burak2 { get; set; } // Burak2
+        DbSet<CalculatedColumnNotNull> CalculatedColumnNotNulls { get; set; } // CalculatedColumnNotNull
         DbSet<Car> Cars { get; set; } // Car
         DbSet<CarToColour> CarToColours { get; set; } // CarToColour
         DbSet<ClientCreationState> ClientCreationStates { get; set; } // ClientCreationState
@@ -374,6 +376,7 @@ public FredDbContext(DbContextOptions<FredDbContext> options)
         public DbSet<BringTheAction> BringTheActions { get; set; } // BringTheAction
         public DbSet<Burak1> Burak1 { get; set; } // Burak1
         public DbSet<Burak2> Burak2 { get; set; } // Burak2
+        public DbSet<CalculatedColumnNotNull> CalculatedColumnNotNulls { get; set; } // CalculatedColumnNotNull
         public DbSet<Car> Cars { get; set; } // Car
         public DbSet<CarToColour> CarToColours { get; set; } // CarToColour
         public DbSet<ClientCreationState> ClientCreationStates { get; set; } // ClientCreationState
@@ -497,6 +500,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.ApplyConfiguration(new BringTheActionConfiguration());
             modelBuilder.ApplyConfiguration(new Burak1Configuration());
             modelBuilder.ApplyConfiguration(new Burak2Configuration());
+            modelBuilder.ApplyConfiguration(new CalculatedColumnNotNullConfiguration());
             modelBuilder.ApplyConfiguration(new CarConfiguration());
             modelBuilder.ApplyConfiguration(new CarToColourConfiguration());
             modelBuilder.ApplyConfiguration(new ClientCreationStateConfiguration());
@@ -1601,6 +1605,7 @@ public class FakeFredDbContext : IFredDbContext
         public DbSet<BringTheAction> BringTheActions { get; set; } // BringTheAction
         public DbSet<Burak1> Burak1 { get; set; } // Burak1
         public DbSet<Burak2> Burak2 { get; set; } // Burak2
+        public DbSet<CalculatedColumnNotNull> CalculatedColumnNotNulls { get; set; } // CalculatedColumnNotNull
         public DbSet<Car> Cars { get; set; } // Car
         public DbSet<CarToColour> CarToColours { get; set; } // CarToColour
         public DbSet<ClientCreationState> ClientCreationStates { get; set; } // ClientCreationState
@@ -1700,6 +1705,7 @@ public FakeFredDbContext()
             BringTheActions = new FakeDbSet<BringTheAction>("C36");
             Burak1 = new FakeDbSet<Burak1>("Id");
             Burak2 = new FakeDbSet<Burak2>("Id");
+            CalculatedColumnNotNulls = new FakeDbSet<CalculatedColumnNotNull>("Id");
             Cars = new FakeDbSet<Car>("Id");
             CarToColours = new FakeDbSet<CarToColour>("CarId", "ColourId");
             ClientCreationStates = new FakeDbSet<ClientCreationState>("Id");
@@ -3365,6 +3371,15 @@ public class Burak2
         public virtual Burak1 Burak1_IdT { get; set; } // Burak1.FK_Burak_Test1
     }
 
+    // CalculatedColumnNotNull
+    public class CalculatedColumnNotNull
+    {
+        public int Id { get; set; } // ID (Primary key)
+        public byte Type { get; set; } // Type
+        public bool IsCalendar { get; private set; } // IsCalendar
+        public bool IsUtilization { get; private set; } // IsUtilization
+    }
+
     // Car
     public class Car
     {
@@ -4976,6 +4991,21 @@ public void Configure(EntityTypeBuilder<Burak2> builder)
         }
     }
 
+    // CalculatedColumnNotNull
+    public class CalculatedColumnNotNullConfiguration : IEntityTypeConfiguration<CalculatedColumnNotNull>
+    {
+        public void Configure(EntityTypeBuilder<CalculatedColumnNotNull> builder)
+        {
+            builder.ToTable("CalculatedColumnNotNull", "dbo");
+            builder.HasKey(x => x.Id).HasName("PK_CalculatedColumnNotNull");
+
+            builder.Property(x => x.Id).HasColumnName(@"ID").HasColumnType("int").IsRequired().ValueGeneratedOnAdd().UseIdentityColumn();
+            builder.Property(x => x.Type).HasColumnName(@"Type").HasColumnType("tinyint").IsRequired();
+            builder.Property(x => x.IsCalendar).HasColumnName(@"IsCalendar").HasColumnType("bit").IsRequired().ValueGeneratedOnAddOrUpdate();
+            builder.Property(x => x.IsUtilization).HasColumnName(@"IsUtilization").HasColumnType("bit").IsRequired().ValueGeneratedOnAddOrUpdate();
+        }
+    }
+
     // Car
     public class CarConfiguration : IEntityTypeConfiguration<Car>
     {
@@ -5266,7 +5296,7 @@ public void Configure(EntityTypeBuilder<dcg_RovColumnDefinition> builder)
             builder.Property(x => x.DomainCatalog).HasColumnName(@"DOMAIN_CATALOG").HasColumnType("nvarchar(128)").IsRequired(false).HasMaxLength(128);
             builder.Property(x => x.DomainSchema).HasColumnName(@"DOMAIN_SCHEMA").HasColumnType("nvarchar(128)").IsRequired(false).HasMaxLength(128);
             builder.Property(x => x.DomainName).HasColumnName(@"DOMAIN_NAME").HasColumnType("nvarchar(128)").IsRequired(false).HasMaxLength(128);
-            builder.Property(x => x.Type).HasColumnName(@"TYPE").HasColumnType("char(2)").IsRequired(false).IsFixedLength().IsUnicode(false).HasMaxLength(2);
+            builder.Property(x => x.Type).HasColumnName(@"TYPE").HasColumnType("char(2)").HasConversion(new ValueConverter<string, string>(v => v.TrimEnd(), v => v.TrimEnd())).IsRequired(false).IsFixedLength().IsUnicode(false).HasMaxLength(2);
         }
     }