Merge branch 'NH-3618' into 3.4.x

Author: hazzik

src/NHibernate.Test/MappingByCode/MappersTests/ManyToOneMapperTest.cs

@@ -198,6 +198,25 @@ public void WhenSetBasicColumnValuesThroughShortCutThenMergeColumn()
 			mapping.index.Should().Be("II");
 		}
 
+		[Test(Description = "NH-3618")]
+		public void SetUniqueToMultiColumn()
+		{
+			var hbmMapping = new HbmMapping();
+			var member = typeof(MyClass).GetProperty("Relation");
+			var mapping = new HbmManyToOne();
+			var mapper = new ManyToOneMapper(member, mapping, hbmMapping);
+			mapper.Columns(x => x.Name("pizza"), x => x.Name("pasta"));
+			mapper.Unique(true);
+			mapper.UniqueKey("AA");
+			mapper.Index("II");
+
+			Assert.That(mapping.Items, Is.Not.Null.And.Not.Empty);
+			Assert.IsNull(mapping.column);
+			Assert.IsTrue(mapping.unique);
+			Assert.That(mapping.uniquekey, Is.EqualTo("AA"));
+			Assert.That(mapping.index, Is.EqualTo("II"));
+		}
+
 		[Test]
 		public void WhenSetFetchModeToJoinThenSetFetch()
 		{

src/NHibernate/Mapping/ByCode/Impl/ManyToOneMapper.cs

@@ -54,17 +54,17 @@ public void NotNullable(bool notnull)
 
 		public void Unique(bool unique)
 		{
-			Column(x => x.Unique(unique));
+			_manyToOne.unique = unique;
 		}
 
 		public void UniqueKey(string uniquekeyName)
 		{
-			Column(x => x.UniqueKey(uniquekeyName));
+			_manyToOne.uniquekey = uniquekeyName;
 		}
 
 		public void Index(string indexName)
 		{
-			Column(x => x.Index(indexName));
+			_manyToOne.index = indexName;
 		}
 
 		public void Fetch(FetchKind fetchMode)