Merge branch 'master' into Feature/navprop_decl

Author: sjh37

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

@@ -595,10 +595,12 @@ public class Order
         /// Parent Customer pointed by [Orders].([CustomerId]) (Orders_FK00)
         /// </summary>
         public virtual Customer Customer { get; set; } // Orders_FK00
+
         /// <summary>
         /// Parent Employee pointed by [Orders].([EmployeeId]) (Orders_FK02)
         /// </summary>
         public virtual Employee Employee { get; set; } // Orders_FK02
+
         /// <summary>
         /// Parent Shipper pointed by [Orders].([ShipVia]) (Orders_FK01)
         /// </summary>
@@ -626,6 +628,7 @@ public class OrderDetail
         /// Parent Order pointed by [Order Details].([OrderId]) (Order Details_FK01)
         /// </summary>
         public virtual Order Order { get; set; } // Order Details_FK01
+
         /// <summary>
         /// Parent Product pointed by [Order Details].([ProductId]) (Order Details_FK00)
         /// </summary>
@@ -661,6 +664,7 @@ public class Product
         /// Parent Category pointed by [Products].([CategoryId]) (Products_FK01)
         /// </summary>
         public virtual Category Category { get; set; } // Products_FK01
+
         /// <summary>
         /// Parent Supplier pointed by [Products].([SupplierId]) (Products_FK00)
         /// </summary>

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

@@ -13,7 +13,7 @@
     //ProviderName = "System.Data.SqlServerCe.4.0";
 
     Namespace = "EntityFramework_Reverse_POCO_Generator.SqlCe4"; // Override the default namespace here
-    DbContextName = "MyDbContextSqlCE4";
+    DbContextName = "MyDbContextSqlCE4"; // Note: If generating separate files, please give the db context a different name from this tt filename.
     //DbContextInterfaceName = "IMyDbContextSqlCE4"; // Defaults to "I" + DbContextName or set string empty to not implement any interface.
     DbContextInterfaceBaseClasses = "System.IDisposable";    // Specify what the base classes are for your database context interface
     DbContextBaseClass = "System.Data.Entity.DbContext";   // Specify what the base class is for your DbContext. For ASP.NET Identity use "IdentityDbContext<ApplicationUser>"
@@ -48,6 +48,7 @@
     // If you need to serialize your entities with the JsonSerializer from Newtonsoft, this would serialize
     // all properties including the Reverse Navigation and Foreign Keys. The simplest way to exclude them is
     // to use the data annotation [JsonIgnore] on reverse navigation and foreign keys.
+    // For more control, take a look at ForeignKeyAnnotationsProcessing() further down
     AdditionalReverseNavigationsDataAnnotations = new string[] // Data Annotations for all ReverseNavigationProperty.
     {
         // "JsonIgnore" // Also add "Newtonsoft.Json" to the AdditionalNamespaces array above
@@ -269,6 +270,18 @@
     {
         //if (t.ClassName == "User")
         //    return ": IdentityUser<int, CustomUserLogin, CustomUserRole, CustomUserClaim>";
+
+        // Or use the maker class to dynamically build more complex definitions
+        /* Example:
+        var r = new BaseClassMaker("POCO.Sample.Data.MetaModelObject");
+        r.AddInterface("POCO.Sample.Data.IObjectWithTableName");
+        r.AddInterface("POCO.Sample.Data.IObjectWithId",
+            t.Columns.Any(x => x.IsPrimaryKey && !x.IsNullable && x.NameHumanCase.Equals("Id", StringComparison.InvariantCultureIgnoreCase) && x.PropertyType == "long"));
+        r.AddInterface("POCO.Sample.Data.IObjectWithUserId",
+            t.Columns.Any(x => !x.IsPrimaryKey && !x.IsNullable && x.NameHumanCase.Equals("UserId", StringComparison.InvariantCultureIgnoreCase) && x.PropertyType == "long"));
+        return r.ToString();
+        */
+
         return "";
     };
 
@@ -404,6 +417,20 @@
         return fkName;
     };
 
+    ForeignKeyAnnotationsProcessing = (Table fkTable, Table pkTable, string propName) =>
+    {
+        /* Example:
+        // Each navigation property that is a reference to User are left intact
+        if (pkTable.NameHumanCase.Equals("User") && propName.Equals("User"))
+            return null;
+
+        // all the others are marked with this attribute
+        return new[] { "System.Runtime.Serialization.IgnoreDataMember" };
+        */
+
+        return null;
+    };
+
     // Return true to include this table in the db context
     ConfigurationFilter = (Table t) =>
     {

EntityFramework.Reverse.POCO.Generator/Database.cs

@@ -1227,10 +1227,12 @@ public class Order
         /// Parent Customer pointed by [Orders].([CustomerId]) (FK_Orders_Customers)
         /// </summary>
         public virtual Customer Customer { get; set; } // FK_Orders_Customers
+
         /// <summary>
         /// Parent Employee pointed by [Orders].([EmployeeId]) (FK_Orders_Employees)
         /// </summary>
         public virtual Employee Employee { get; set; } // FK_Orders_Employees
+
         /// <summary>
         /// Parent Shipper pointed by [Orders].([ShipVia]) (FK_Orders_Shippers)
         /// </summary>
@@ -1259,6 +1261,7 @@ public class OrderDetail
         /// Parent Order pointed by [Order Details].([OrderId]) (FK_Order_Details_Orders)
         /// </summary>
         public virtual Order Order { get; set; } // FK_Order_Details_Orders
+
         /// <summary>
         /// Parent Product pointed by [Order Details].([ProductId]) (FK_Order_Details_Products)
         /// </summary>
@@ -1347,6 +1350,7 @@ public class Product
         /// Parent Category pointed by [Products].([CategoryId]) (FK_Products_Categories)
         /// </summary>
         public virtual Category Category { get; set; } // FK_Products_Categories
+
         /// <summary>
         /// Parent Supplier pointed by [Products].([SupplierId]) (FK_Products_Suppliers)
         /// </summary>

EntityFramework.Reverse.POCO.Generator/Database.tt

@@ -13,7 +13,7 @@
     //ProviderName = "System.Data.SqlClient";
 
     // Namespace = ""; // Override the default namespace here
-    DbContextName = "MyDbContext";
+    DbContextName = "MyDbContext"; // Note: If generating separate files, please give the db context a different name from this tt filename.
     //DbContextInterfaceName = "IMyDbContext"; // Defaults to "I" + DbContextName or set string empty to not implement any interface.
     DbContextInterfaceBaseClasses = "System.IDisposable";    // Specify what the base classes are for your database context interface
     DbContextBaseClass = "System.Data.Entity.DbContext";   // Specify what the base class is for your DbContext. For ASP.NET Identity use "IdentityDbContext<ApplicationUser>"
@@ -53,6 +53,7 @@
     // If you need to serialize your entities with the JsonSerializer from Newtonsoft, this would serialize
     // all properties including the Reverse Navigation and Foreign Keys. The simplest way to exclude them is
     // to use the data annotation [JsonIgnore] on reverse navigation and foreign keys.
+    // For more control, take a look at ForeignKeyAnnotationsProcessing() further down
     AdditionalReverseNavigationsDataAnnotations = new string[] // Data Annotations for all ReverseNavigationProperty.
     {
         // "JsonIgnore" // Also add "Newtonsoft.Json" to the AdditionalNamespaces array above
@@ -324,6 +325,18 @@
     {
         //if (t.ClassName == "User")
         //    return ": IdentityUser<int, CustomUserLogin, CustomUserRole, CustomUserClaim>";
+
+        // Or use the maker class to dynamically build more complex definitions
+        /* Example:
+        var r = new BaseClassMaker("POCO.Sample.Data.MetaModelObject");
+        r.AddInterface("POCO.Sample.Data.IObjectWithTableName");
+        r.AddInterface("POCO.Sample.Data.IObjectWithId",
+            t.Columns.Any(x => x.IsPrimaryKey && !x.IsNullable && x.NameHumanCase.Equals("Id", StringComparison.InvariantCultureIgnoreCase) && x.PropertyType == "long"));
+        r.AddInterface("POCO.Sample.Data.IObjectWithUserId",
+            t.Columns.Any(x => !x.IsPrimaryKey && !x.IsNullable && x.NameHumanCase.Equals("UserId", StringComparison.InvariantCultureIgnoreCase) && x.PropertyType == "long"));
+        return r.ToString();
+        */
+
         return "";
     };
 
@@ -459,6 +472,20 @@
         return fkName;
     };
 
+    ForeignKeyAnnotationsProcessing = (Table fkTable, Table pkTable, string propName) =>
+    {
+        /* Example:
+        // Each navigation property that is a reference to User are left intact
+        if (pkTable.NameHumanCase.Equals("User") && propName.Equals("User"))
+            return null;
+
+        // all the others are marked with this attribute
+        return new[] { "System.Runtime.Serialization.IgnoreDataMember" };
+        */
+
+        return null;
+    };
+
     // Return true to include this table in the db context
     ConfigurationFilter = (Table t) =>
     {