Update required for previous patch.

Author: sjh37

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

@@ -27,6 +27,7 @@
     UsePascalCase = true;    // This will rename the generated C# tables & properties to use PascalCase. If false table & property names will be left alone.
     UseDataAnnotations = false; // If true, will add data annotations to the poco classes.
     UseDataAnnotationsSchema = false; // UseDataAnnotations must also be true. If true, will add data annotations schema to the poco classes.
+    UsePropertyInitializers = false; // C# 6 feature
     IncludeComments = CommentsStyle.AtEndOfField; // Adds comments to the generated code
     IncludeExtendedPropertyComments = CommentsStyle.InSummaryBlock; // Adds extended properties as comments to the generated code
     IncludeViews = true;
@@ -358,6 +359,20 @@
             return "ContactPerson";
         */
 
+        // FK_TableName_FromThisToParentRelationshipName_FromParentToThisChildsRelationshipName
+        // (e.g. FK_CustomerAddress_Customer_Addresses will extract navigation properties "address.Customer" and "customer.Addresses")
+        if (foreignKey.ConstraintName.StartsWith("FK_") && foreignKey.ConstraintName.Count(x => x == '_') == 3)
+        {
+            var parts = foreignKey.ConstraintName.Split('_');
+            if (!string.IsNullOrWhiteSpace(parts[2]) && !string.IsNullOrWhiteSpace(parts[3]))
+            {
+                if (relationship == Relationship.OneToMany)
+                    fkName = parts[3];
+                else if (relationship == Relationship.ManyToOne)
+                    fkName = parts[2];
+            }
+        }
+
         return fkName;
     };
 

EntityFramework.Reverse.POCO.Generator/Database.tt

@@ -27,6 +27,7 @@
     UsePascalCase = true;    // This will rename the generated C# tables & properties to use PascalCase. If false table & property names will be left alone.
     UseDataAnnotations = false; // If true, will add data annotations to the poco classes.
     UseDataAnnotationsSchema = false; // UseDataAnnotations must also be true. If true, will add data annotations schema to the poco classes.
+    UsePropertyInitializers = false; // C# 6 feature
     IncludeComments = CommentsStyle.AtEndOfField; // Adds comments to the generated code
     IncludeExtendedPropertyComments = CommentsStyle.InSummaryBlock; // Adds extended properties as comments to the generated code
     IncludeViews = true;
@@ -412,6 +413,20 @@
             return "ContactPerson";
         */
 
+        // FK_TableName_FromThisToParentRelationshipName_FromParentToThisChildsRelationshipName
+        // (e.g. FK_CustomerAddress_Customer_Addresses will extract navigation properties "address.Customer" and "customer.Addresses")
+        if (foreignKey.ConstraintName.StartsWith("FK_") && foreignKey.ConstraintName.Count(x => x == '_') == 3)
+        {
+            var parts = foreignKey.ConstraintName.Split('_');
+            if (!string.IsNullOrWhiteSpace(parts[2]) && !string.IsNullOrWhiteSpace(parts[3]))
+            {
+                if (relationship == Relationship.OneToMany)
+                    fkName = parts[3];
+                else if (relationship == Relationship.ManyToOne)
+                    fkName = parts[2];
+            }
+        }
+
         return fkName;
     };
 

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

@@ -55,7 +55,7 @@
         bool MakeDbContextInterfacePartial = false;
         bool GenerateSeparateFiles = false;
         bool UseMappingTables = true;
-        static bool UsePropertyInitializers = false;
+        bool UsePropertyInitializers = false;
         bool IsSqlCe = false;
         string FileExtension = ".cs";
         bool UsePascalCase = true;
@@ -3275,7 +3275,7 @@ SELECT  SERVERPROPERTY('Edition') AS Edition,
                 {
                     case Relationship.OneToOne:
                         ReverseNavigationProperty.Add(
-                            new PropertyAndComments() 
+                            new PropertyAndComments()
                             {
                                 Definition = string.Format("public virtual {0} {1} {{ get; set; }}{2}", fkTable.NameHumanCaseWithSuffix, propName, includeComments != CommentsStyle.None ? " // " + constraint : string.Empty),
                                 Comments = string.Format("Parent (One-to-One) {0} pointed by [{1}].{2} ({3})", this.NameHumanCaseWithSuffix, fkTable.Name, fkNames, fks.First().ConstraintName)
@@ -3285,7 +3285,7 @@ SELECT  SERVERPROPERTY('Edition') AS Edition,
 
                     case Relationship.OneToMany:
                         ReverseNavigationProperty.Add(
-                            new PropertyAndComments() 
+                            new PropertyAndComments()
                             {
                                 Definition = string.Format("public virtual {0} {1} {{ get; set; }}{2}", fkTable.NameHumanCaseWithSuffix, propName, includeComments != CommentsStyle.None ? " // " + constraint : string.Empty),
                                 Comments = string.Format("Parent {0} pointed by [{1}].{2} ({3})", this.NameHumanCaseWithSuffix, fkTable.Name, fkNames, fks.First().ConstraintName)
@@ -3296,7 +3296,7 @@ SELECT  SERVERPROPERTY('Edition') AS Edition,
                     case Relationship.ManyToOne:
                         var initialization1 = string.Format(" = new {0}<{1}>();", collectionType, fkTable.NameHumanCaseWithSuffix);
                         ReverseNavigationProperty.Add(
-                            new PropertyAndComments() 
+                            new PropertyAndComments()
                             {
                                 Definition = string.Format("public virtual System.Collections.Generic.ICollection<{0}> {1} {{ get; set; }}{2}{3}", fkTable.NameHumanCaseWithSuffix, propName, initialization1, includeComments != CommentsStyle.None ? " // " + constraint : string.Empty),
                                 Comments = string.Format("Child {0} where [{1}].{2} point to this entity ({3})", Inflector.MakePlural(fkTable.NameHumanCase), fkTable.Name, fkNames, fks.First().ConstraintName)
@@ -3308,7 +3308,7 @@ SELECT  SERVERPROPERTY('Edition') AS Edition,
                     case Relationship.ManyToMany:
                         var initialization2 = string.Format(" = new {0}<{1}>();", collectionType, fkTable.NameHumanCaseWithSuffix);
                         ReverseNavigationProperty.Add(
-                            new PropertyAndComments() 
+                            new PropertyAndComments()
                             {
                                 Definition = string.Format("public virtual System.Collections.Generic.ICollection<{0}> {1} {{ get; set; }}{2}{3}", fkTable.NameHumanCaseWithSuffix, propName, initialization2, includeComments != CommentsStyle.None ? " // Many to many mapping" : string.Empty),
                                 Comments = string.Format("Child {0} (Many-to-Many) mapped by table [{1}]", Inflector.MakePlural(fkTable.NameHumanCase), mappingTable.Name)