nhibernate#347

govorovvs · Nov 16, 2017 · c366f6a · c366f6a
1 parent 04ea60e
commit c366f6a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/...tNHibernate.Testing/ConventionsTests/OverridingFluentInterface/PropertyConventionTests.cs b/...tNHibernate.Testing/ConventionsTests/OverridingFluentInterface/PropertyConventionTests.cs
@@ -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]

diff --git a/src/FluentNHibernate.Testing/DomainModel/Mapping/ClassMapConventionsTester.cs b/src/FluentNHibernate.Testing/DomainModel/Mapping/ClassMapConventionsTester.cs
@@ -108,7 +108,7 @@ 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);
         }
     }
 }
diff --git a/src/FluentNHibernate/Mapping/PropertyPart.cs b/src/FluentNHibernate/Mapping/PropertyPart.cs
@@ -183,7 +183,9 @@ 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>
@@ -206,11 +208,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);
         }
 
         private void AddColumnsFromCompositeUserType(Type compositeUserType)
@@ -361,4 +359,4 @@ TypeReference GetDefaultType()
             return type;
         }
     }
-}
+}