Merge branch '3.3.x'

Author: hazzik

src/NHibernate.Test/MappingByCode/CustomizerHolderMergeTest.cs

@@ -105,6 +105,20 @@ public void MergeShouldMergeManyToManyMapper()
 			called.Should().Be.True();
 		}
 
+		[Test]
+		public void MergeShouldMergeManyToAnyMapper()
+		{
+			var emptyHolder = new CustomizersHolder();
+			var holder = new CustomizersHolder();
+			var called = false;
+
+			holder.AddCustomizer(propertyPath, (IManyToAnyMapper x) => called = true);
+			emptyHolder.Merge(holder);
+			emptyHolder.InvokeCustomizers(propertyPath, (IManyToAnyMapper) null);
+
+			called.Should().Be.True();
+		}
+
 		[Test]
 		public void MergeShouldMergeOneToManyMapper()
 		{

src/NHibernate/Hql/Ast/ANTLR/Tree/ASTNode.cs

@@ -17,7 +17,7 @@ public class ASTNode : IASTNode, ITree
 		private readonly IToken _token;
 		private List<IASTNode> _children;
 
-		public ASTNode()
+	    public ASTNode()
 			: this((IToken)null) {}
 
 		public ASTNode(IToken token)
@@ -425,7 +425,6 @@ object ITree.DeleteChild(int i)
 		{
 			object node = _children[i];
 			RemoveChild(i);
-
 			return node;
 		}
 
@@ -469,7 +468,11 @@ ITree ITree.DupNode()
 			return (ITree) DupNode();
 		}
 
-		int ITree.ChildIndex { get; set; }
+		int ITree.ChildIndex
+		{
+			get { return _childIndex; }
+			set { _childIndex = value; }
+		}
 
 		ITree ITree.Parent
 		{
@@ -513,6 +516,7 @@ IEnumerator IEnumerable.GetEnumerator()
 		{
 			return GetEnumerator();
 		}
+
 		#endregion
 
 		// //////////////////////////////////////////////////////////

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

@@ -364,6 +364,7 @@ public void Merge(CustomizersHolder source)
 			MergeDictionary(collectionRelationManyToManyCustomizers, source.collectionRelationManyToManyCustomizers);
 			MergeDictionary(collectionRelationElementCustomizers, source.collectionRelationElementCustomizers);
 			MergeDictionary(collectionRelationOneToManyCustomizers, source.collectionRelationOneToManyCustomizers);
+			MergeDictionary(collectionRelationManyToAnyCustomizers, source.collectionRelationManyToAnyCustomizers);
 			MergeDictionary(mapKeyManyToManyCustomizers, source.mapKeyManyToManyCustomizers);
 			MergeDictionary(mapKeyElementCustomizers, source.mapKeyElementCustomizers);
 			MergeDictionary(dynamicComponentCustomizers, source.dynamicComponentCustomizers);
@@ -387,7 +388,7 @@ private void MergeDictionary<TSubject, TCustomizable>(Dictionary<TSubject, List<
 		}
 
 		private void AddCustomizer<TSubject, TCustomizable>(IDictionary<TSubject, List<Action<TCustomizable>>> customizers,
-		                                                    TSubject member, Action<TCustomizable> customizer)
+															TSubject member, Action<TCustomizable> customizer)
 		{
 			List<Action<TCustomizable>> actions;
 			if (!customizers.TryGetValue(member, out actions))