Skip to content

Use Type as PropertyPart CustomType instead of only name #347

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

Merged
merged 5 commits into from
Mar 18, 2025
Merged

Use Type as PropertyPart CustomType instead of only name #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d9621a8
Don't use only name for PropertyPart.CustomType
Jul 4, 2016
767aea3
Adapt tests to new behaviour of PropertyPart
Jul 4, 2016
8bc0a09
Merge branch 'main' into use-type-as-propertypart-customtype
Mar 17, 2025
a0aa635
Fix deepsource complaint CS-R1064
Mar 17, 2025
87acc65
Fix line endings in changed files
Mar 17, 2025
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
4 changes: 2 additions & 2 deletions ...tNHibernate.Testing/ConventionsTests/OverridingFluentInterface/PropertyConventionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void TypeShouldntBeOverwritten()

Convention(x => x.CustomType<int>());

VerifyModel(x => x.Type.Name.ShouldEqual(typeof(CustomUserType).AssemblyQualifiedName));
VerifyModel(x => x.Type.GetUnderlyingSystemType().ShouldEqual(typeof(CustomUserType)));
}

[Test]
Expand Down Expand Up @@ -285,4 +285,4 @@ void VerifyModel(Action<PropertyMapping> modelVerification)
}

#endregion
}
}
4 changes: 2 additions & 2 deletions src/FluentNHibernate.Testing/DomainModel/Mapping/ClassMapConventionsTester.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,6 @@ public void EnumsDontGetTypeOverriddenByConventionsIfExplicitlySet()
{
new MappingTester<MappedObject>()
.ForMapping(m => m.Map(x => x.Color).CustomType(typeof(int)))
.Element("class/property[@name='Color']").HasAttribute("type", typeof(int).Name);
.Element("class/property[@name='Color']").HasAttribute("type", typeof(int).AssemblyQualifiedName);
}
}
}
13 changes: 5 additions & 8 deletions src/FluentNHibernate/Mapping/PropertyPart.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ public class PropertyPart : IPropertyMappingProvider
{
readonly Member member;
readonly Type parentType;
readonly AttributeStore attributes = new AttributeStore();
readonly AttributeStore columnAttributes = new AttributeStore();
readonly AttributeStore attributes = new();
readonly AttributeStore columnAttributes = new();

bool nextBool = true;

Expand Down Expand Up @@ -171,7 +171,8 @@ public PropertyPart CustomType(Type type)
if (typeof(ICompositeUserType).IsAssignableFrom(type))
AddColumnsFromCompositeUserType(type);

return CustomType(TypeMapping.GetTypeString(type));
attributes.Set("Type", Layer.UserSupplied, new TypeReference(type));
return this;
}

/// <summary>
Expand All @@ -194,11 +195,7 @@ public PropertyPart CustomType(string type)
public PropertyPart CustomType(Func<Type, Type> typeFunc)
{
var type = typeFunc.Invoke(member.PropertyType);

if (typeof(ICompositeUserType).IsAssignableFrom(type))
AddColumnsFromCompositeUserType(type);

return CustomType(TypeMapping.GetTypeString(type));
return CustomType(type);
}

void AddColumnsFromCompositeUserType(Type compositeUserType)
Expand Down