#832 Add more data annotations

sjh37 · Feb 13, 2024 · dca9911 · dca9911
1 parent 6a849e0
commit dca9911
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 1 deletion.
diff --git a/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.v3.ttinclude b/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.v3.ttinclude
@@ -4001,6 +4001,7 @@
                 NameHumanCaseWithSuffix = table.NameHumanCaseWithSuffix(),
                 Schema = table.Schema.DbName,
                 PrimaryKeyNameHumanCase = primaryKey ?? table.PrimaryKeyNameHumanCase(),
+                NotUsingDataAnnotations = !Settings.UseDataAnnotations,
                 HasSchema = !string.IsNullOrEmpty(table.Schema.DbName),
                 ClassModifier = Settings.ConfigurationClassesModifiers,
                 ClassComment = table.WriteComments(),
@@ -17297,6 +17298,9 @@ SELECT  SERVERPROPERTY('Edition') AS Edition,
             foreach (var attribute in Attributes.Distinct())
                 sb.AppendLine(attribute);
 
+            if (Settings.UseDataAnnotations)
+                sb.AppendLine($"[Table(\"{DbName}\", Schema = \"{Schema.DbName}\")]");
+
             return sb.ToString();
         }
 
@@ -17492,6 +17496,7 @@ SELECT  SERVERPROPERTY('Edition') AS Edition,
         public string Schema { get; set; }
         public string PrimaryKeyNameHumanCase { get; set; }
         public bool HasSchema { get; set; }
+        public bool NotUsingDataAnnotations { get; set; }
         public string ClassModifier { get; set; }
         public string ClassComment { get; set; }
         public List<string> Columns { get; set; }
@@ -20451,10 +20456,12 @@ public class FakeDbContextTransaction : IDbContextTransaction{{#newline}}
 
     public void Configure(EntityTypeBuilder<{{NameHumanCaseWithSuffix}}> builder){{#newline}}
     {{{#newline}}
+{{#if NotUsingDataAnnotations}}
 {{#if HasSchema}}
         builder.{{ToTableOrView}}(""{{Name}}"", ""{{Schema}}"");{{#newline}}
 {{#else}}
         builder.{{ToTableOrView}}(""{{Name}}"");{{#newline}}
+{{/if}}
 {{/if}}
         {{PrimaryKeyNameHumanCase}}{{#newline}}{{#newline}}
 
@@ -22096,10 +22103,12 @@ public class FakeDbContextTransaction : IDbContextTransaction{{#newline}}
 
     public void Configure(EntityTypeBuilder<{{NameHumanCaseWithSuffix}}> builder){{#newline}}
     {{{#newline}}
+{{#if NotUsingDataAnnotations}}
 {{#if HasSchema}}
         builder.{{ToTableOrView}}(""{{Name}}"", ""{{Schema}}"");{{#newline}}
 {{#else}}
         builder.{{ToTableOrView}}(""{{Name}}"");{{#newline}}
+{{/if}}
 {{/if}}
         {{PrimaryKeyNameHumanCase}}{{#newline}}{{#newline}}
 
@@ -23748,10 +23757,12 @@ public class FakeDbContextTransaction : IDbContextTransaction{{#newline}}
 
     public void Configure(EntityTypeBuilder<{{NameHumanCaseWithSuffix}}> builder){{#newline}}
     {{{#newline}}
+{{#if NotUsingDataAnnotations}}
 {{#if HasSchema}}
         builder.{{ToTableOrView}}(""{{Name}}"", ""{{Schema}}"");{{#newline}}
 {{#else}}
         builder.{{ToTableOrView}}(""{{Name}}"");{{#newline}}
+{{/if}}
 {{/if}}
         {{PrimaryKeyNameHumanCase}}{{#newline}}{{#newline}}
 
@@ -25400,10 +25411,12 @@ public class FakeDbContextTransaction : IDbContextTransaction{{#newline}}
 
     public void Configure(EntityTypeBuilder<{{NameHumanCaseWithSuffix}}> builder){{#newline}}
     {{{#newline}}
+{{#if NotUsingDataAnnotations}}
 {{#if HasSchema}}
         builder.{{ToTableOrView}}(""{{Name}}"", ""{{Schema}}"");{{#newline}}
 {{#else}}
         builder.{{ToTableOrView}}(""{{Name}}"");{{#newline}}
+{{/if}}
 {{/if}}
         {{PrimaryKeyNameHumanCase}}{{#newline}}{{#newline}}
 

diff --git a/Generator/Generators/CodeGenerator.cs b/Generator/Generators/CodeGenerator.cs
@@ -592,6 +592,7 @@ public CodeOutput GeneratePocoConfiguration(Table table)
                 NameHumanCaseWithSuffix = table.NameHumanCaseWithSuffix(),
                 Schema = table.Schema.DbName,
                 PrimaryKeyNameHumanCase = primaryKey ?? table.PrimaryKeyNameHumanCase(),
+                NotUsingDataAnnotations = !Settings.UseDataAnnotations,
                 HasSchema = !string.IsNullOrEmpty(table.Schema.DbName),
                 ClassModifier = Settings.ConfigurationClassesModifiers,
                 ClassComment = table.WriteComments(),

diff --git a/Generator/Generators/GeneratorEf6.cs b/Generator/Generators/GeneratorEf6.cs
@@ -94,7 +94,7 @@ protected override void SetupConfig(Column c)
             sb.AppendFormat(".HasColumnName(@\"{0}\")", c.DbName);
 
             var excludedHasColumnType = string.Empty;
-            if (!string.IsNullOrEmpty(c.SqlPropertyType))
+            if (!Settings.UseDataAnnotations && !string.IsNullOrEmpty(c.SqlPropertyType))
             {
                 if(Column.ExcludedHasColumnType.Contains(c.SqlPropertyType))
                     excludedHasColumnType = string.Format(" // .HasColumnType(\"{0}\") was excluded", c.SqlPropertyType);

diff --git a/Generator/Table.cs b/Generator/Table.cs
@@ -315,6 +315,9 @@ public string WriteClassAttributes()
             foreach (var attribute in Attributes.Distinct())
                 sb.AppendLine(attribute);
 
+            if (Settings.UseDataAnnotations)
+                sb.AppendLine($"[Table(\"{DbName}\", Schema = \"{Schema.DbName}\")]");
+
             return sb.ToString();
         }
 

diff --git a/Generator/TemplateModels/PocoConfigurationModel.cs b/Generator/TemplateModels/PocoConfigurationModel.cs
@@ -10,6 +10,7 @@ public class PocoConfigurationModel
         public string Schema { get; set; }
         public string PrimaryKeyNameHumanCase { get; set; }
         public bool HasSchema { get; set; }
+        public bool NotUsingDataAnnotations { get; set; }
         public string ClassModifier { get; set; }
         public string ClassComment { get; set; }
         public List<string> Columns { get; set; }

diff --git a/Generator/Templates/TemplateEfCore3.cs b/Generator/Templates/TemplateEfCore3.cs
@@ -1485,10 +1485,12 @@ public override string PocoConfiguration()
 
     public void Configure(EntityTypeBuilder<{{NameHumanCaseWithSuffix}}> builder){{#newline}}
     {{{#newline}}
+{{#if NotUsingDataAnnotations}}
 {{#if HasSchema}}
         builder.{{ToTableOrView}}(""{{Name}}"", ""{{Schema}}"");{{#newline}}
 {{#else}}
         builder.{{ToTableOrView}}(""{{Name}}"");{{#newline}}
+{{/if}}
 {{/if}}
         {{PrimaryKeyNameHumanCase}}{{#newline}}{{#newline}}
 

diff --git a/Generator/Templates/TemplateEfCore6.cs b/Generator/Templates/TemplateEfCore6.cs
@@ -1538,10 +1538,12 @@ public override string PocoConfiguration()
 
     public void Configure(EntityTypeBuilder<{{NameHumanCaseWithSuffix}}> builder){{#newline}}
     {{{#newline}}
+{{#if NotUsingDataAnnotations}}
 {{#if HasSchema}}
         builder.{{ToTableOrView}}(""{{Name}}"", ""{{Schema}}"");{{#newline}}
 {{#else}}
         builder.{{ToTableOrView}}(""{{Name}}"");{{#newline}}
+{{/if}}
 {{/if}}
         {{PrimaryKeyNameHumanCase}}{{#newline}}{{#newline}}
 

diff --git a/Generator/Templates/TemplateEfCore7.cs b/Generator/Templates/TemplateEfCore7.cs
@@ -1545,10 +1545,12 @@ public override string PocoConfiguration()
 
     public void Configure(EntityTypeBuilder<{{NameHumanCaseWithSuffix}}> builder){{#newline}}
     {{{#newline}}
+{{#if NotUsingDataAnnotations}}
 {{#if HasSchema}}
         builder.{{ToTableOrView}}(""{{Name}}"", ""{{Schema}}"");{{#newline}}
 {{#else}}
         builder.{{ToTableOrView}}(""{{Name}}"");{{#newline}}
+{{/if}}
 {{/if}}
         {{PrimaryKeyNameHumanCase}}{{#newline}}{{#newline}}
 

diff --git a/Generator/Templates/TemplateEfCore8.cs b/Generator/Templates/TemplateEfCore8.cs
@@ -1545,10 +1545,12 @@ public override string PocoConfiguration()
 
     public void Configure(EntityTypeBuilder<{{NameHumanCaseWithSuffix}}> builder){{#newline}}
     {{{#newline}}
+{{#if NotUsingDataAnnotations}}
 {{#if HasSchema}}
         builder.{{ToTableOrView}}(""{{Name}}"", ""{{Schema}}"");{{#newline}}
 {{#else}}
         builder.{{ToTableOrView}}(""{{Name}}"");{{#newline}}
+{{/if}}
 {{/if}}
         {{PrimaryKeyNameHumanCase}}{{#newline}}{{#newline}}
 

diff --git a/_File based templates/Templates.EFCore3/PocoConfiguration.mustache b/_File based templates/Templates.EFCore3/PocoConfiguration.mustache
@@ -4,10 +4,12 @@
 
     public void Configure(EntityTypeBuilder<{{NameHumanCaseWithSuffix}}> builder){{#newline}}
     {{{#newline}}
+{{#if NotUsingDataAnnotations}}
 {{#if HasSchema}}
         builder.{{ToTableOrView}}("{{Name}}", "{{Schema}}");{{#newline}}
 {{#else}}
         builder.{{ToTableOrView}}("{{Name}}");{{#newline}}
+{{/if}}
 {{/if}}
         {{PrimaryKeyNameHumanCase}}{{#newline}}{{#newline}}
 

diff --git a/_File based templates/Templates.EFCore6/PocoConfiguration.mustache b/_File based templates/Templates.EFCore6/PocoConfiguration.mustache
@@ -4,10 +4,12 @@
 
     public void Configure(EntityTypeBuilder<{{NameHumanCaseWithSuffix}}> builder){{#newline}}
     {{{#newline}}
+{{#if NotUsingDataAnnotations}}
 {{#if HasSchema}}
         builder.{{ToTableOrView}}("{{Name}}", "{{Schema}}");{{#newline}}
 {{#else}}
         builder.{{ToTableOrView}}("{{Name}}");{{#newline}}
+{{/if}}
 {{/if}}
         {{PrimaryKeyNameHumanCase}}{{#newline}}{{#newline}}
 

diff --git a/_File based templates/Templates.EFCore7/PocoConfiguration.mustache b/_File based templates/Templates.EFCore7/PocoConfiguration.mustache
@@ -4,10 +4,12 @@
 
     public void Configure(EntityTypeBuilder<{{NameHumanCaseWithSuffix}}> builder){{#newline}}
     {{{#newline}}
+{{#if NotUsingDataAnnotations}}
 {{#if HasSchema}}
         builder.{{ToTableOrView}}("{{Name}}", "{{Schema}}");{{#newline}}
 {{#else}}
         builder.{{ToTableOrView}}("{{Name}}");{{#newline}}
+{{/if}}
 {{/if}}
         {{PrimaryKeyNameHumanCase}}{{#newline}}{{#newline}}
 

diff --git a/_File based templates/Templates.EFCore8/PocoConfiguration.mustache b/_File based templates/Templates.EFCore8/PocoConfiguration.mustache
@@ -4,10 +4,12 @@
 
     public void Configure(EntityTypeBuilder<{{NameHumanCaseWithSuffix}}> builder){{#newline}}
     {{{#newline}}
+{{#if NotUsingDataAnnotations}}
 {{#if HasSchema}}
         builder.{{ToTableOrView}}("{{Name}}", "{{Schema}}");{{#newline}}
 {{#else}}
         builder.{{ToTableOrView}}("{{Name}}");{{#newline}}
+{{/if}}
 {{/if}}
         {{PrimaryKeyNameHumanCase}}{{#newline}}{{#newline}}