Merge pull request #1537 from linq2db/t4_partial_initmappingschema

convert InitMappingSchema method to partial method
linq2db · Jan 19, 2019 · 444b8f1 · 444b8f1
2 parents e4c2468 + e40a72b
commit 444b8f1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Source/LinqToDB.Templates/LinqToDB.PostgreSQL.ttinclude b/Source/LinqToDB.Templates/LinqToDB.PostgreSQL.ttinclude
@@ -26,7 +26,8 @@ bool GenerateCaseSensitiveNames = false; // Defines whether to generate case sen
 // exception: functions with only one out parameter treat it as return parameter
 void FixRecordResultFunctions()
 {
-	var initMappingSchema = DataContextObject.Members.OfType<Method>().Single(m => m.Name == "InitMappingSchema");
+	var initMappingSchema = new Method(() => "void", "InitMappingSchema") { AccessModifier = AccessModifier.Partial };
+	DataContextObject.Members.Add(initMappingSchema);
 	foreach (var proc in Procedures.Values
 		.Where(p => p.IsFunction && !p.IsAggregateFunction && !p.IsTableFunction && p.ProcParameters.Any(pr => pr.IsOut)))
 	{

diff --git a/Source/LinqToDB.Templates/LinqToDB.ttinclude b/Source/LinqToDB.Templates/LinqToDB.ttinclude
@@ -50,8 +50,6 @@ static IEnumerable<Method> GetConstructorsImpl(string defaultConfiguration, stri
 
 void GenerateTypesFromMetadata()
 {
-	DataContextObject.Members.Add(new Method(() => "void", "InitMappingSchema"));
-
 	BeforeGenerateLinqToDBModel();
 
 	Model.Usings.Add("LinqToDB");
@@ -161,7 +159,11 @@ void GenerateTypesFromMetadata()
 	DataContextObject.Members.Add(new MemberGroup
 	{
 		IsCompact = true,
-		Members   = { new Method(() => "void", "InitDataContext") { AccessModifier = AccessModifier.Partial } }
+		Members   =
+		{
+			new Method(() => "void", "InitDataContext"  ) { AccessModifier = AccessModifier.Partial },
+			new Method(() => "void", "InitMappingSchema") { AccessModifier = AccessModifier.Partial }
+		}
 	});
 
 	if (Tables.Count > 0)
@@ -947,7 +949,7 @@ void GenerateTypesFromMetadata()
 		MakeTypeMembersNamesUnique(DataContextObject, "InitDataContext", "InitMappingSchema");
 		MakeMembersNamesUnique(Model.Types, "Table");
 		foreach (var type in Model.Types.OfType<Class>())
-			MakeTypeMembersNamesUnique(type, exceptMethods: new [] { "Find" });
+			MakeTypeMembersNamesUnique(type, exceptMethods: new [] { "Find", "InitDataContext", "InitMappingSchema" });
 
 		foreach (var schema in schemas.Values)
 		{