Skip to content

Added support for multiple inheritance, unit tests fixed, restriction on property override in THP. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Added support for multiple inheritance, unit tests fixed, restriction on property override in THP. #1

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ce770e1
Fix nuget package config.
pluskal Jan 19, 2017
7728c5e
Fix TPH mapping, details commented in code.
pluskal Jan 19, 2017
e5e72c0
Fix Entity_ComplextType_WhereComplexTypeIsLastProperty
pluskal Jan 19, 2017
a773cb1
Added test for two complex types in a type. One as a last property.
pluskal Jan 19, 2017
54b0a4f
Added support for multiple inheritence, unit tests fixed, restriction…
pluskal Jan 21, 2017
85219ea
Fix... model classes added.
pluskal Jan 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix Entity_ComplextType_WhereComplexTypeIsLastProperty
  • Loading branch information
@pluskal
pluskal committed Jan 19, 2017
commit e5e72c0738c81dd6b80c7464e645bb6c401d3f40
15 changes: 11 additions & 4 deletions EntityFramework.MappingAPI/Mappers/MapperBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,8 @@ public EntityMap MapEntity(string typeFullName, EdmType edmItem)
// |
// C - N3,P6ref
// Mapping B it mixes doscriminator with N1 ...
var propertiesToMap = entityMap.IsTph ? storageEntitySet.ElementType.Properties.Take(storageEntitySet.ElementType.Properties.Count - 1) : GetPropertiesToMap(entityMap, storageEntitySet.ElementType.Properties);
var propertiesToMap = GetPropertiesToMap(entityMap, storageEntitySet.ElementType.Properties);
//var propertiesToMap = entityMap.IsTph ? storageEntitySet.ElementType.Properties.Take(storageEntitySet.ElementType.Properties.Count - 1) : GetPropertiesToMap(entityMap, storageEntitySet.ElementType.Properties);

foreach (var edmProperty in propertiesToMap)
{
Expand Down Expand Up @@ -460,11 +461,17 @@ private void MapProperty(EntityMap entityMap, EdmProperty edmProperty, ref int i
var entityMembers = TphData[identity].Properties;
var columnName = edmProperty.Name;

if (entityMembers.Length <= i)
EdmMember edmMember;
if(entityMembers.Length <= i)
{
return;
if(prefix != null) { edmMember = entityMembers[i-1]; }
else
{ return; }
}
else
{
edmMember = entityMembers[i];
}
EdmMember edmMember = entityMembers[i];

// check if is complex type
if (string.IsNullOrEmpty(prefix) && edmMember.TypeUsage.EdmType.GetType() == typeof(ComplexType))
Expand Down