Merge pull request #99 from MaciejSzczepanski/master

Fixed Formula with ManyToOne

Author: jagregory

src/FluentNHibernate.Testing/DomainModel/Mapping/ManyToOneTester.cs

@@ -162,5 +162,18 @@ public void LazyLoadResetsNotValue()
                         .Not.LazyLoad().Not.Nullable())
                 .Element("class/many-to-one/column").HasAttribute("not-null", "true");
         }
+
+        [Test]
+        public void ManyToOneFormulaShouldSetFormulaAndNotRenderColumn()
+        {
+            new MappingTester<MappedObject>()
+                .ForMapping(map =>
+                {
+                    map.References(x => x.Parent)
+                        .Formula("foo(bar)");
+                })
+                .Element("class/many-to-one").HasAttribute("formula", "foo(bar)")
+                .Element("class/many-to-one/column").DoesntExist();
+        }
     }
 }

src/FluentNHibernate/Mapping/ManyToOnePart.cs

@@ -353,7 +353,7 @@ ManyToOneMapping IManyToOneMappingProvider.GetManyToOneMapping()
             mapping.Set(x => x.Name, Layer.Defaults, member.Name);
             mapping.Set(x => x.Class, Layer.Defaults, new TypeReference(typeof(TOther)));
 
-            if (columns.Count == 0)
+            if (columns.Count == 0 && !mapping.IsSpecified("Formula"))
                 mapping.AddColumn(Layer.Defaults, CreateColumn(member.Name + "_id"));
 
             foreach (var column in columns)