Merge pull request nhibernate#230 from whut/MappingByCodeAdditions

NH-3558 - Table check and enhanced id generators in Mapping By Code

Author: oskarb

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

@@ -98,6 +98,21 @@ public void CanSetGeneratorAssigned()
 			hbmId.generator.@class.Should().Be.EqualTo("assigned");
 		}
 
+		[Test]
+		public void CanSetGeneratorEnhancedSequence()
+		{
+			var hbmId = new HbmId();
+			new IdMapper(hbmId).Generator(Generators.EnhancedSequence);
+			hbmId.generator.@class.Should().Be.EqualTo("enhanced-sequence");
+		}
+
+		[Test]
+		public void CanSetGeneratorEnhancedTable()
+		{
+			var hbmId = new HbmId();
+			new IdMapper(hbmId).Generator(Generators.EnhancedTable);
+			hbmId.generator.@class.Should().Be.EqualTo("enhanced-table");
+		}
 		private class BaseEntity
 		{
 			private int id;

src/NHibernate/Mapping/ByCode/Generators.cs

@@ -15,6 +15,8 @@ static Generators()
 			Sequence = new SequenceGeneratorDef();
 			Identity = new IdentityGeneratorDef();
 			Assigned = new AssignedGeneratorDef();
+			EnhancedSequence = new EnhancedSequenceGeneratorDef();
+			EnhancedTable = new EnhancedTableGeneratorDef();
 		}
 
 		public static IGeneratorDef Assigned { get; private set; }
@@ -24,6 +26,8 @@ static Generators()
 		public static IGeneratorDef GuidComb { get; private set; }
 		public static IGeneratorDef Sequence { get; private set; }
 		public static IGeneratorDef Identity { get; private set; }
+		public static IGeneratorDef EnhancedSequence { get; private set; }
+		public static IGeneratorDef EnhancedTable { get; private set; }
 
 		public static IGeneratorDef Foreign<TEntity>(Expression<Func<TEntity, object>> property)
 		{
@@ -257,4 +261,56 @@ public bool SupportedAsCollectionElementId
 		}
 		#endregion
 	}
+
+	public class EnhancedSequenceGeneratorDef : IGeneratorDef
+	{
+		#region Implementation of IGeneratorDef
+
+		public string Class
+		{
+			get { return "enhanced-sequence"; }
+		}
+
+		public object Params
+		{
+			get { return null; }
+		}
+
+		public System.Type DefaultReturnType
+		{
+			get { return typeof(int); }
+		}
+
+		public bool SupportedAsCollectionElementId
+		{
+			get { return true; }
+		}
+		#endregion
+	}
+
+	public class EnhancedTableGeneratorDef : IGeneratorDef
+	{
+		#region Implementation of IGeneratorDef
+
+		public string Class
+		{
+			get { return "enhanced-table"; }
+		}
+
+		public object Params
+		{
+			get { return null; }
+		}
+
+		public System.Type DefaultReturnType
+		{
+			get { return typeof(int); }
+		}
+
+		public bool SupportedAsCollectionElementId
+		{
+			get { return true; }
+		}
+		#endregion
+	}
 }

src/NHibernate/Mapping/ByCode/IClassMapper.cs

@@ -15,6 +15,7 @@ public interface IClassAttributesMapper : IEntityAttributesMapper, IEntitySqlsMa
 		void Discriminator(Action<IDiscriminatorMapper> discriminatorMapping);
 		void DiscriminatorValue(object value);
 		void Table(string tableName);
+		void Check(string check);
 		void Catalog(string catalogName);
 		void Schema(string schemaName);
 		void Mutable(bool isMutable);

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

@@ -166,6 +166,11 @@ public void Table(string tableName)
 			classMapping.table = tableName;
 		}
 
+		public void Check(string check)
+		{
+			classMapping.check = check;
+		}
+
 		public void Catalog(string catalogName)
 		{
 			classMapping.catalog = catalogName;

src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ClassCustomizer.cs

@@ -101,6 +101,11 @@ public void Table(string tableName)
 			CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.Table(tableName));
 		}
 
+		public void Check(string tableName)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.Check(tableName));
+		}
+
 		public void Catalog(string catalogName)
 		{
 			CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.Catalog(catalogName));