Merge branch 'master' into CacheBase

Author: fredericDelaporte

doc/reference/modules/component_mapping.xml

@@ -138,16 +138,6 @@
             model and persistence semantics are still slightly different.
         </para>
 
-        <para>
-            A composite element mapping does not support null-able properties if you are using
-            a <literal>&lt;set&gt;</literal>. There is no separate primary key column in the
-            composite element table. NHibernate uses each column's value to identify a record
-            when deleting objects, which is not possible with null values. You have to either
-            use only not-null properties in a composite-element or choose a
-            <literal>&lt;list&gt;</literal>, <literal>&lt;map&gt;</literal>,
-            <literal>&lt;bag&gt;</literal> or <literal>&lt;idbag&gt;</literal>.
-        </para>
-
         <para>
             A special case of a composite element is a composite element with a nested
             <literal>&lt;many-to-one&gt;</literal> element. This mapping allows you to map extra

src/NHibernate.DomainModel/NHSpecific/NullableInt32Type.cs

@@ -46,14 +46,9 @@ public override void Set(DbCommand cmd, object value, int index, ISessionImpleme
 			}
 		}
 
-		public override object FromStringValue(string xml)
-		{
-			return NullableInt32.Parse(xml);
-		}
-
 		public override bool[] ToColumnNullness(object value, Engine.IMapping mapping)
 		{
 			return value == null || NullableInt32.Default.Equals(value) ? new bool[] { false } : new bool[] { true };
 		}
 	}
-}
+}

src/NHibernate.DomainModel/NHSpecific/NullableTypesType.cs

@@ -35,11 +35,6 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses
 			return Get(rs, rs.GetOrdinal(name), session);
 		}
 
-		public override string ToString(object value)
-		{
-			return value.ToString();
-		}
-
 		public override string Name
 		{
 			get { return ReturnedClass.Name; }
@@ -52,4 +47,4 @@ public override bool IsEqual(object x, object y)
 
 		public abstract object NullValue { get; }
 	}
-}
+}

src/NHibernate.Test.VisualBasic/Issues/IssueTestCase.vb

@@ -2,17 +2,4 @@
 
 Public Class IssueTestCase
     Inherits BugTestCase
-
-    Protected Overrides ReadOnly Property MappingsAssembly As String
-        Get
-            Return "NHibernate.Test.VisualBasic"
-        End Get
-    End Property
-
-    Protected Overrides ReadOnly Property Mappings As IList
-        Get
-            Return New String() {"Issues." + BugNumber + ".Mappings.hbm.xml"}
-        End Get
-    End Property
-
 End Class

src/NHibernate.Test/Ado/BatcherFixture.cs

@@ -13,7 +13,7 @@ protected override string MappingsAssembly
 			get { return "NHibernate.Test"; }
 		}
 
-		protected override IList Mappings
+		protected override string[] Mappings
 		{
 			get { return new[] { "Ado.VerySimple.hbm.xml", "Ado.AlmostSimple.hbm.xml" }; }
 		}

src/NHibernate.Test/Ado/GenericBatchingBatcherFixture.cs

@@ -15,7 +15,7 @@ public class GenericBatchingBatcherFixture : TestCase
 	{
 		protected override string MappingsAssembly => "NHibernate.Test";
 
-		protected override IList Mappings => new[] {"Ado.VerySimple.hbm.xml"};
+		protected override string[] Mappings => new[] {"Ado.VerySimple.hbm.xml"};
 
 		protected override void Configure(Configuration configuration)
 		{

src/NHibernate.Test/Any/AnyTypeTest.cs

@@ -11,7 +11,7 @@ protected override string MappingsAssembly
 			get { return "NHibernate.Test"; }
 		}
 
-		protected override IList Mappings
+		protected override string[] Mappings
 		{
 			get { return new string[] {"Any.Person.hbm.xml"}; }
 		}

src/NHibernate.Test/Async/Ado/BatcherFixture.cs

@@ -25,7 +25,7 @@ protected override string MappingsAssembly
 			get { return "NHibernate.Test"; }
 		}
 
-		protected override IList Mappings
+		protected override string[] Mappings
 		{
 			get { return new[] { "Ado.VerySimple.hbm.xml", "Ado.AlmostSimple.hbm.xml" }; }
 		}

src/NHibernate.Test/Async/Ado/GenericBatchingBatcherFixture.cs

@@ -28,7 +28,7 @@ public class GenericBatchingBatcherFixtureAsync : TestCase
 	{
 		protected override string MappingsAssembly => "NHibernate.Test";
 
-		protected override IList Mappings => new[] {"Ado.VerySimple.hbm.xml"};
+		protected override string[] Mappings => new[] {"Ado.VerySimple.hbm.xml"};
 
 		protected override void Configure(Configuration configuration)
 		{

src/NHibernate.Test/Async/Any/AnyTypeTest.cs

@@ -22,7 +22,7 @@ protected override string MappingsAssembly
 			get { return "NHibernate.Test"; }
 		}
 
-		protected override IList Mappings
+		protected override string[] Mappings
 		{
 			get { return new string[] {"Any.Person.hbm.xml"}; }
 		}