src/FluentNHibernate.Testing/FluentInterfaceTests/KeyManyToOnePartTests.cs src/FluentNHibernate/Mapping/KeyManyToOnePart.cs @@ -59,6 +59,15 @@ namespace FluentNHibernate.Testing.DomainModel.Mapping .Element("class/composite-id/key-many-to-one/column").HasAttribute("name", "SomeColumn"); } + [Test] + public void KeyManyToOneForeignKey() + { + new MappingTester<CompIdTarget>() + .ForMapping(c => c.CompositeId().KeyReference(x => x.Child, "SomeColumn", p => p.ForeignKey("fk1"))) + .Element("class/composite-id/key-many-to-one").HasAttribute("foreign-key", "fk1"); + } + + [Test] public void MixedKeyPropertyAndManyToOne() { src/FluentNHibernate.Testing/DomainModel/Mapping/CompositeIdentityPartTester.cs @@ -143,6 +143,7 @@ <Compile Include="FluentInterfaceTests\ElementPartTests.cs" /> <Compile Include="DomainModel\Mapping\FilterTester.cs" /> <Compile Include="FluentInterfaceTests\ClassMapFilterPartModelGenerationTests.cs" /> + <Compile Include="FluentInterfaceTests\KeyManyToOnePartTests.cs" /> <Compile Include="FluentInterfaceTests\ManyToManyPartAsTernaryTests.cs" /> <Compile Include="FluentInterfaceTests\OneToManyPartAsTernaryTests.cs" /> <Compile Include="FluentInterfaceTests\WhereTests.cs" /> src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Reflection; using FluentNHibernate.Mapping; @@ -20,11 +21,11 @@ namespace FluentNHibernate.Automapping return base.KeyProperty(property, columnName); } - protected override CompositeIdentityPart<T> KeyReference(PropertyInfo property, string columnName) + protected override CompositeIdentityPart<T> KeyReference(PropertyInfo property, string columnName, Action<KeyManyToOnePart> customMapping) { mappedProperties.Add(property.Name); - return base.KeyReference(property, columnName); + return base.KeyReference(property, columnName, customMapping); } } } \ No newline at end of file src/FluentNHibernate/Automapping/AutoCompositeIdentityPart.cs @@ -370,6 +370,7 @@ <Compile Include="Mapping\FilterDefinition.cs" /> <Compile Include="Mapping\FilterPart.cs" /> <Compile Include="Mapping\IFilterDefinition.cs" /> + <Compile Include="Mapping\KeyManyToOnePart.cs" /> <Compile Include="Mapping\Providers\IFilterMappingProvider.cs" /> <Compile Include="Utils\ReflectionExtensions.cs" /> <Compile Include="Mapping\PolymorphismBuilder.cs" /> src/FluentNHibernate/FluentNHibernate.csproj @@ -72,7 +72,7 @@ namespace FluentNHibernate.Mapping { var property = ReflectionHelper.GetProperty(expression); - return KeyReference(property, property.Name); + return KeyReference(property, property.Name, null); } /// <summary> @@ -85,10 +85,25 @@ namespace FluentNHibernate.Mapping { var property = ReflectionHelper.GetProperty(expression); - return KeyReference(property, columnName); + return KeyReference(property, columnName, null); } - protected virtual CompositeIdentityPart<T> KeyReference(PropertyInfo property, string columnName) + + /// <summary> + /// Defines a reference to be used as a many-to-one key for this composite-id with an explicit column name. + /// </summary> + /// <param name="expression">A member access lambda expression for the property</param> + /// <param name="columnName">The column name in the database to use for this key, or null to use the property name</param> + /// <param name="customMapping">A lambda expression specifying additional settings for the key reference</param> + /// <returns>The composite identity part fluent interface</returns> + public CompositeIdentityPart<T> KeyReference(Expression<Func<T, object>> expression, string columnName, Action<KeyManyToOnePart> customMapping) + { + var property = ReflectionHelper.GetProperty(expression); + + return KeyReference(property, columnName, customMapping); + } + + protected virtual CompositeIdentityPart<T> KeyReference(PropertyInfo property, string columnName, Action<KeyManyToOnePart> customMapping) { var key = new KeyManyToOneMapping { @@ -98,7 +113,12 @@ namespace FluentNHibernate.Mapping }; key.AddColumn(new ColumnMapping { Name = columnName }); - keyManyToOnes.Add(key); + var keyPart = new KeyManyToOnePart(key); + + if (customMapping != null) + customMapping(keyPart); + + keyManyToOnes.Add(key); return this; } src/FluentNHibernate/Mapping/CompositeIdentityPart.cs 40c65ebfd97ba71001f177734a98f8d3b0e6aecb Paul Batum paul.batum@gmail.com http://github.com/jagregory/fluent-nhibernate/commit/66171c104114002d262b0a96a07998f0c39b7802 66171c104114002d262b0a96a07998f0c39b7802 2009-11-02T22:39:15-08:00 2009-11-02T22:39:15-08:00 Added support for specifying attributes on a key-many-to-one element. Resolves issue #237 f4c6532934cde2d13577cd1be3078fe357db076a Paul Batum paul.batum@gmail.com