Quick tidy post PR

sjh37 · sjh37 · commit 720826b03a85 · 2025-12-22T13:30:46.000Z
diff --git a/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.v3.ttinclude b/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.v3.ttinclude
@@ -3876,7 +3876,7 @@
 
         private static string GetConnectionStringActions(bool hasSpatialTypes, bool hasHierarchyIdType)
         {
-            if (Settings.TemplateType == TemplateType.Ef6)
+            if (Settings.IsEf6())
                 return string.Empty;
 
             if (!hasSpatialTypes && !hasHierarchyIdType)
@@ -7263,8 +7263,9 @@
     {
         public Dictionary<string, string> GetMapping()
         {
-            var geographyType = Settings.TemplateType == TemplateType.Ef6 ? "DbGeography" : "NetTopologySuite.Geometries.Point";
-            var geometryType = Settings.TemplateType == TemplateType.Ef6 ? "DbGeometry" : "NetTopologySuite.Geometries.Geometry";
+            var isEf6 = Settings.IsEf6();
+            var geographyType = isEf6 ? "DbGeography" : "NetTopologySuite.Geometries.Point";
+            var geometryType = isEf6 ? "DbGeometry" : "NetTopologySuite.Geometries.Geometry";
 
             // [Database type] = Language type
             return new Dictionary<string, string>
@@ -7551,8 +7552,9 @@
         // [Database type] = Language type
         public Dictionary<string, string> GetMapping()
         {
-            var geographyType = Settings.TemplateType == TemplateType.Ef6 ? "DbGeography" : "NetTopologySuite.Geometries.Point";
-            var geometryType  = Settings.TemplateType == TemplateType.Ef6 ? "DbGeometry"  : "NetTopologySuite.Geometries.Geometry";
+            var isEf6 = Settings.IsEf6();
+            var geographyType = isEf6 ? "DbGeography" : "NetTopologySuite.Geometries.Point";
+            var geometryType  = isEf6 ? "DbGeometry"  : "NetTopologySuite.Geometries.Geometry";
 
             return new Dictionary<string, string>
             {
diff --git a/Generator/Generators/CodeGenerator.cs b/Generator/Generators/CodeGenerator.cs
@@ -378,7 +378,7 @@ public CodeOutput GenerateContext()
 
         private static string GetConnectionStringActions(bool hasSpatialTypes, bool hasHierarchyIdType)
         {
-            if (Settings.TemplateType == TemplateType.Ef6)
+            if (Settings.IsEf6())
                 return string.Empty;
 
             if (!hasSpatialTypes && !hasHierarchyIdType)
diff --git a/Generator/LanguageMapping/MySqlToCSharp.cs b/Generator/LanguageMapping/MySqlToCSharp.cs
@@ -1,14 +1,14 @@
 ﻿using System.Collections.Generic;
-using Efrpg.Templates;
 
 namespace Efrpg.LanguageMapping
 {
     public class MySqlToCSharp : IDatabaseToPropertyType
     {
         public Dictionary<string, string> GetMapping()
         {
-            var geographyType = Settings.TemplateType == TemplateType.Ef6 || Settings.TemplateType == TemplateType.FileBasedEf6 ? "DbGeography" : "NetTopologySuite.Geometries.Point";
-            var geometryType = Settings.TemplateType == TemplateType.Ef6 || Settings.TemplateType == TemplateType.FileBasedEf6 ? "DbGeometry" : "NetTopologySuite.Geometries.Geometry";
+            var isEf6 = Settings.IsEf6();
+            var geographyType = isEf6 ? "DbGeography" : "NetTopologySuite.Geometries.Point";
+            var geometryType = isEf6 ? "DbGeometry" : "NetTopologySuite.Geometries.Geometry";
 
             // [Database type] = Language type
             return new Dictionary<string, string>
diff --git a/Generator/LanguageMapping/SqlServerToCSharp.cs b/Generator/LanguageMapping/SqlServerToCSharp.cs
@@ -8,8 +8,9 @@ public class SqlServerToCSharp : IDatabaseToPropertyType
         // [Database type] = Language type
         public Dictionary<string, string> GetMapping()
         {
-            var geographyType = Settings.TemplateType == TemplateType.Ef6 || Settings.TemplateType == TemplateType.FileBasedEf6 ? "DbGeography" : "NetTopologySuite.Geometries.Point";
-            var geometryType  = Settings.TemplateType == TemplateType.Ef6 || Settings.TemplateType == TemplateType.FileBasedEf6 ? "DbGeometry"  : "NetTopologySuite.Geometries.Geometry";
+            var isEf6 = Settings.IsEf6();
+            var geographyType = isEf6 ? "DbGeography" : "NetTopologySuite.Geometries.Point";
+            var geometryType  = isEf6 ? "DbGeometry"  : "NetTopologySuite.Geometries.Geometry";
 
             return new Dictionary<string, string>
             {

Original file line number	Diff line number	Diff line change
`@@ -3876,7 +3876,7 @@`
`3876`	`3876`
`3877`	`3877`	`private static string GetConnectionStringActions(bool hasSpatialTypes, bool hasHierarchyIdType)`
`3878`	`3878`	`{`
`3879`		`- if (Settings.TemplateType == TemplateType.Ef6)`
	`3879`	`+ if (Settings.IsEf6())`
`3880`	`3880`	`return string.Empty;`
`3881`	`3881`
`3882`	`3882`	`if (!hasSpatialTypes && !hasHierarchyIdType)`
`@@ -7263,8 +7263,9 @@`
`7263`	`7263`	`{`
`7264`	`7264`	`public Dictionary<string, string> GetMapping()`
`7265`	`7265`	`{`
`7266`		`- var geographyType = Settings.TemplateType == TemplateType.Ef6 ? "DbGeography" : "NetTopologySuite.Geometries.Point";`
`7267`		`- var geometryType = Settings.TemplateType == TemplateType.Ef6 ? "DbGeometry" : "NetTopologySuite.Geometries.Geometry";`
	`7266`	`+ var isEf6 = Settings.IsEf6();`
	`7267`	`+ var geographyType = isEf6 ? "DbGeography" : "NetTopologySuite.Geometries.Point";`
	`7268`	`+ var geometryType = isEf6 ? "DbGeometry" : "NetTopologySuite.Geometries.Geometry";`
`7268`	`7269`
`7269`	`7270`	`// [Database type] = Language type`
`7270`	`7271`	`return new Dictionary<string, string>`
`@@ -7551,8 +7552,9 @@`
`7551`	`7552`	`// [Database type] = Language type`
`7552`	`7553`	`public Dictionary<string, string> GetMapping()`
`7553`	`7554`	`{`
`7554`		`- var geographyType = Settings.TemplateType == TemplateType.Ef6 ? "DbGeography" : "NetTopologySuite.Geometries.Point";`
`7555`		`- var geometryType = Settings.TemplateType == TemplateType.Ef6 ? "DbGeometry" : "NetTopologySuite.Geometries.Geometry";`
	`7555`	`+ var isEf6 = Settings.IsEf6();`
	`7556`	`+ var geographyType = isEf6 ? "DbGeography" : "NetTopologySuite.Geometries.Point";`
	`7557`	`+ var geometryType = isEf6 ? "DbGeometry" : "NetTopologySuite.Geometries.Geometry";`
`7556`	`7558`
`7557`	`7559`	`return new Dictionary<string, string>`
`7558`	`7560`	`{`
Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ public CodeOutput GenerateContext()`
`378`	`378`
`379`	`379`	`private static string GetConnectionStringActions(bool hasSpatialTypes, bool hasHierarchyIdType)`
`380`	`380`	`{`
`381`		`- if (Settings.TemplateType == TemplateType.Ef6)`
	`381`	`+ if (Settings.IsEf6())`
`382`	`382`	`return string.Empty;`
`383`	`383`
`384`	`384`	`if (!hasSpatialTypes && !hasHierarchyIdType)`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`		`-using Efrpg.Templates;`
`3`	`2`
`4`	`3`	`namespace Efrpg.LanguageMapping`
`5`	`4`	`{`
`6`	`5`	`public class MySqlToCSharp : IDatabaseToPropertyType`
`7`	`6`	`{`
`8`	`7`	`public Dictionary<string, string> GetMapping()`
`9`	`8`	`{`
`10`		`- var geographyType = Settings.TemplateType == TemplateType.Ef6 \|\| Settings.TemplateType == TemplateType.FileBasedEf6 ? "DbGeography" : "NetTopologySuite.Geometries.Point";`
`11`		`- var geometryType = Settings.TemplateType == TemplateType.Ef6 \|\| Settings.TemplateType == TemplateType.FileBasedEf6 ? "DbGeometry" : "NetTopologySuite.Geometries.Geometry";`
	`9`	`+ var isEf6 = Settings.IsEf6();`
	`10`	`+ var geographyType = isEf6 ? "DbGeography" : "NetTopologySuite.Geometries.Point";`
	`11`	`+ var geometryType = isEf6 ? "DbGeometry" : "NetTopologySuite.Geometries.Geometry";`
`12`	`12`
`13`	`13`	`// [Database type] = Language type`
`14`	`14`	`return new Dictionary<string, string>`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,9 @@ public class SqlServerToCSharp : IDatabaseToPropertyType`
`8`	`8`	`// [Database type] = Language type`
`9`	`9`	`public Dictionary<string, string> GetMapping()`
`10`	`10`	`{`
`11`		`- var geographyType = Settings.TemplateType == TemplateType.Ef6 \|\| Settings.TemplateType == TemplateType.FileBasedEf6 ? "DbGeography" : "NetTopologySuite.Geometries.Point";`
`12`		`- var geometryType = Settings.TemplateType == TemplateType.Ef6 \|\| Settings.TemplateType == TemplateType.FileBasedEf6 ? "DbGeometry" : "NetTopologySuite.Geometries.Geometry";`
	`11`	`+ var isEf6 = Settings.IsEf6();`
	`12`	`+ var geographyType = isEf6 ? "DbGeography" : "NetTopologySuite.Geometries.Point";`
	`13`	`+ var geometryType = isEf6 ? "DbGeometry" : "NetTopologySuite.Geometries.Geometry";`
`13`	`14`
`14`	`15`	`return new Dictionary<string, string>`
`15`	`16`	`{`