merge fix

MaceWindu · MaceWindu · commit 9481e812a013 · 2023-10-13T20:29:53.000+02:00
diff --git a/Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs b/Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs
@@ -109,7 +109,7 @@ public MappingAttribute[] GetAttributes(Type type)
 				{
 					foreach (var e in _model.GetEntityTypes())
 					{
-						if (GetBaseTypeRecursive(e) == et && e.GetDiscriminatorValue() != null)
+						if (GetBaseTypeRecursive(e) == et && e.Relational().DiscriminatorValue != null)
 							{
 							result.AddRange(GetMappingAttributesRecursive(e));
 							}
@@ -146,7 +146,7 @@ List<InheritanceMappingAttribute> ProcessEntityType(IEntityType et)
 					mappings.Add(new()
 					{
 						Type = et.ClrType,
-						Code = entityType.GetDiscriminatorValue()
+						Code = entityType.Relational().DiscriminatorValue
 					});
 				}
 				

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public MappingAttribute[] GetAttributes(Type type)`
`109`	`109`	`{`
`110`	`110`	`foreach (var e in _model.GetEntityTypes())`
`111`	`111`	`{`
`112`		`- if (GetBaseTypeRecursive(e) == et && e.GetDiscriminatorValue() != null)`
	`112`	`+ if (GetBaseTypeRecursive(e) == et && e.Relational().DiscriminatorValue != null)`
`113`	`113`	`{`
`114`	`114`	`result.AddRange(GetMappingAttributesRecursive(e));`
`115`	`115`	`}`
`@@ -146,7 +146,7 @@ List<InheritanceMappingAttribute> ProcessEntityType(IEntityType et)`
`146`	`146`	`mappings.Add(new()`
`147`	`147`	`{`
`148`	`148`	`Type = et.ClrType,`
`149`		`- Code = entityType.GetDiscriminatorValue()`
	`149`	`+ Code = entityType.Relational().DiscriminatorValue`
`150`	`150`	`});`
`151`	`151`	`}`
`152`	`152`