#832 Add more data annotations

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

Hide file tree

Showing 3 changed files with 7 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
@@ -5969,7 +5969,7 @@
             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);
@@ -18871,10 +18871,12 @@ using {{this}};{{#newline}}
 
     public {{ConfigurationClassName}}(string schema){{#newline}}
     {{{#newline}}
+{{#if NotUsingDataAnnotations}}
 {{#if HasSchema}}
         ToTable(""{{Name}}"", schema);{{#newline}}
 {{#else}}
         ToTable(""{{Name}}"");{{#newline}}
+{{/if}}
 {{/if}}
         HasKey({{PrimaryKeyNameHumanCase}});{{#newline}}{{#newline}}
 

diff --git a/Generator/Templates/TemplateEf6.cs b/Generator/Templates/TemplateEf6.cs
@@ -1229,10 +1229,12 @@ public override string PocoConfiguration()
 
     public {{ConfigurationClassName}}(string schema){{#newline}}
     {{{#newline}}
+{{#if NotUsingDataAnnotations}}
 {{#if HasSchema}}
         ToTable(""{{Name}}"", schema);{{#newline}}
 {{#else}}
         ToTable(""{{Name}}"");{{#newline}}
+{{/if}}
 {{/if}}
         HasKey({{PrimaryKeyNameHumanCase}});{{#newline}}{{#newline}}
 

diff --git a/_File based templates/Templates.EF6/PocoConfiguration.mustache b/_File based templates/Templates.EF6/PocoConfiguration.mustache
@@ -9,10 +9,12 @@
 
     public {{ConfigurationClassName}}(string schema){{#newline}}
     {{{#newline}}
+{{#if NotUsingDataAnnotations}}
 {{#if HasSchema}}
         ToTable("{{Name}}", schema);{{#newline}}
 {{#else}}
         ToTable("{{Name}}");{{#newline}}
+{{/if}}
 {{/if}}
         HasKey({{PrimaryKeyNameHumanCase}});{{#newline}}{{#newline}}