Implement support of SqlCheck in mapping by code

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

@@ -112,6 +112,20 @@ public void CanSetSqlInsert()
 			Assert.That(hbmJoin.SqlInsert.Text[0], Is.EqualTo("blah"));
 		}
 
+		[Test]
+		public void CanSetSqlInsertWithCheck()
+		{
+			var mapdoc = new HbmMapping();
+			var hbmJoin = new HbmJoin();
+			var mapper = new JoinMapper(typeof(MyClass), "AA", hbmJoin, mapdoc);
+			mapper.SqlInsert("blah", SqlCheck.RowCount);
+
+			Assert.That(hbmJoin.SqlInsert, Is.Not.Null);
+			Assert.That(hbmJoin.SqlInsert.Text[0], Is.EqualTo("blah"));
+			Assert.That(hbmJoin.SqlInsert.checkSpecified, Is.True);
+			Assert.That(hbmJoin.SqlInsert.check, Is.EqualTo(HbmCustomSQLCheck.Rowcount));
+		}
+
 		[Test]
 		public void SetSqlUpdate()
 		{
@@ -124,6 +138,20 @@ public void SetSqlUpdate()
 			Assert.That(hbmJoin.SqlUpdate.Text[0], Is.EqualTo("blah"));
 		}
 
+		[Test]
+		public void SetSqlUpdateWithCheck()
+		{
+			var mapdoc = new HbmMapping();
+			var hbmJoin = new HbmJoin();
+			var mapper = new JoinMapper(typeof(MyClass), "AA", hbmJoin, mapdoc);
+			mapper.SqlUpdate("blah", SqlCheck.RowCount);
+
+			Assert.That(hbmJoin.SqlUpdate, Is.Not.Null);
+			Assert.That(hbmJoin.SqlUpdate.Text[0], Is.EqualTo("blah"));
+			Assert.That(hbmJoin.SqlUpdate.checkSpecified, Is.True);
+			Assert.That(hbmJoin.SqlUpdate.check, Is.EqualTo(HbmCustomSQLCheck.Rowcount));
+		}
+
 		[Test]
 		public void SetSqlDelete()
 		{
@@ -136,6 +164,20 @@ public void SetSqlDelete()
 			Assert.That(hbmJoin.SqlDelete.Text[0], Is.EqualTo("blah"));
 		}
 
+		[Test]
+		public void SetSqlDeleteWithCheck()
+		{
+			var mapdoc = new HbmMapping();
+			var hbmJoin = new HbmJoin();
+			var mapper = new JoinMapper(typeof(MyClass), "AA", hbmJoin, mapdoc);
+			mapper.SqlDelete("blah", SqlCheck.RowCount);
+
+			Assert.That(hbmJoin.SqlDelete, Is.Not.Null);
+			Assert.That(hbmJoin.SqlDelete.Text[0], Is.EqualTo("blah"));
+			Assert.That(hbmJoin.SqlDelete.checkSpecified, Is.True);
+			Assert.That(hbmJoin.SqlDelete.check, Is.EqualTo(HbmCustomSQLCheck.Rowcount));
+		}
+
 		[Test]
 		public void CanSetSqlSubselect()
 		{

src/NHibernate/Mapping/ByCode/IClassMapper.cs

@@ -77,4 +77,4 @@ public interface IClassMapper<TEntity> : IClassAttributesMapper<TEntity>, IPrope
 	{
 		void Join(string splitGroupId, Action<IJoinMapper<TEntity>> splitMapping);
 	}
-}
+}

src/NHibernate/Mapping/ByCode/IEntitySqlsWithCheckMapper.cs

@@ -0,0 +1,36 @@
+using NHibernate.Util;
+
+namespace NHibernate.Mapping.ByCode
+{
+	//6.0 TODO: merge into IEntitySqlsMapper
+	public interface IEntitySqlsWithCheckMapper
+	{
+		void SqlInsert(string sql, SqlCheck sqlCheck);
+		void SqlUpdate(string sql, SqlCheck sqlCheck);
+		void SqlDelete(string sql, SqlCheck sqlCheck);
+	}
+
+	public static class EntitySqlsWithCheckMapperExtensions
+	{
+		public static void SqlInsert(this IEntitySqlsMapper mapper, string sql, SqlCheck sqlCheck)
+		{
+			ReflectHelper
+				.CastOrThrow<IEntitySqlsWithCheckMapper>(mapper, "SqlInsert with sqlCheck")
+				.SqlInsert(sql, sqlCheck);
+		}
+
+		public static void SqlUpdate(this IEntitySqlsMapper mapper, string sql, SqlCheck sqlCheck)
+		{
+			ReflectHelper
+				.CastOrThrow<IEntitySqlsWithCheckMapper>(mapper, "SqlUpdate with sqlCheck")
+				.SqlUpdate(sql, sqlCheck);
+		}
+
+		public static void SqlDelete(this IEntitySqlsMapper mapper, string sql, SqlCheck sqlCheck)
+		{
+			ReflectHelper
+				.CastOrThrow<IEntitySqlsWithCheckMapper>(mapper, "SqlDelete with sqlCheck")
+				.SqlDelete(sql, sqlCheck);
+		}
+	}
+}

src/NHibernate/Mapping/ByCode/IJoinMapper.cs

@@ -28,4 +28,4 @@ public interface IJoinAttributesMapper<TEntity> : IEntitySqlsMapper where TEntit
 
 	public interface IJoinMapper<TEntity> : IJoinAttributesMapper<TEntity>, ICollectionPropertiesContainerMapper<TEntity>, IBasePlainPropertyContainerMapper<TEntity> 
 		where TEntity : class {}
-}
+}

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

@@ -8,7 +8,7 @@
 
 namespace NHibernate.Mapping.ByCode.Impl
 {
-	public class ClassMapper : AbstractPropertyContainerMapper, IClassMapper
+	public class ClassMapper : AbstractPropertyContainerMapper, IClassMapper, IEntitySqlsWithCheckMapper
 	{
 		private readonly HbmClass classMapping;
 		private readonly IIdMapper idMapper;
@@ -369,6 +369,17 @@ public void SqlInsert(string sql)
 			classMapping.sqlinsert.Text = new[] {sql};
 		}
 
+		public void SqlInsert(string sql, SqlCheck sqlCheck)
+		{
+			if (classMapping.SqlInsert == null)
+			{
+				classMapping.sqlinsert = new HbmCustomSQL();
+			}
+			classMapping.sqlinsert.checkSpecified = true;
+			classMapping.sqlinsert.check = (HbmCustomSQLCheck)Enum.Parse(typeof(HbmCustomSQLCheck), sqlCheck.ToString(), true);
+			classMapping.sqlinsert.Text = new[] { sql };
+		}
+
 		public void SqlUpdate(string sql)
 		{
 			if (classMapping.SqlUpdate == null)
@@ -378,6 +389,17 @@ public void SqlUpdate(string sql)
 			classMapping.sqlupdate.Text = new[] {sql};
 		}
 
+		public void SqlUpdate(string sql, SqlCheck sqlCheck)
+		{
+			if (classMapping.SqlUpdate == null)
+			{
+				classMapping.sqlupdate = new HbmCustomSQL();
+			}
+			classMapping.sqlupdate.checkSpecified = true;
+			classMapping.sqlupdate.check = (HbmCustomSQLCheck)Enum.Parse(typeof(HbmCustomSQLCheck), sqlCheck.ToString(), true);
+			classMapping.sqlupdate.Text = new[] { sql };
+		}
+
 		public void SqlDelete(string sql)
 		{
 			if (classMapping.SqlDelete == null)
@@ -387,6 +409,17 @@ public void SqlDelete(string sql)
 			classMapping.sqldelete.Text = new[] {sql};
 		}
 
+		public void SqlDelete(string sql, SqlCheck sqlCheck)
+		{
+			if (classMapping.SqlDelete == null)
+			{
+				classMapping.sqldelete = new HbmCustomSQL();
+			}
+			classMapping.sqldelete.checkSpecified = true;
+			classMapping.sqldelete.check = (HbmCustomSQLCheck)Enum.Parse(typeof(HbmCustomSQLCheck), sqlCheck.ToString(), true);
+			classMapping.sqldelete.Text = new[] { sql };
+		}
+
 		public void Subselect(string sql)
 		{
 			if (classMapping.Subselect == null)

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

@@ -264,16 +264,31 @@ public void SqlInsert(string sql)
 			CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.SqlInsert(sql));
 		}
 
+		public void SqlInsert(string sql, SqlCheck sqlCheck)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.SqlInsert(sql, sqlCheck));
+		}
+
 		public void SqlUpdate(string sql)
 		{
 			CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.SqlUpdate(sql));
 		}
 
+		public void SqlUpdate(string sql, SqlCheck sqlCheck)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.SqlUpdate(sql, sqlCheck));
+		}
+
 		public void SqlDelete(string sql)
 		{
 			CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.SqlDelete(sql));
 		}
 
+		public void SqlDelete(string sql, SqlCheck sqlCheck)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.SqlDelete(sql, sqlCheck));
+		}
+
 		public void Subselect(string sql)
 		{
 			CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.Subselect(sql));

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

@@ -32,16 +32,31 @@ public void SqlInsert(string sql)
 			CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinAttributesMapper m) => m.SqlInsert(sql));
 		}
 
+		public void SqlInsert(string sql, SqlCheck sqlCheck)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinAttributesMapper m) => m.SqlInsert(sql, sqlCheck));
+		}
+
 		public void SqlUpdate(string sql)
 		{
 			CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinAttributesMapper m) => m.SqlUpdate(sql));
 		}
 
+		public void SqlUpdate(string sql, SqlCheck sqlCheck)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinAttributesMapper m) => m.SqlUpdate(sql, sqlCheck));
+		}
+
 		public void SqlDelete(string sql)
 		{
 			CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinAttributesMapper m) => m.SqlDelete(sql));
 		}
 
+		public void SqlDelete(string sql, SqlCheck sqlCheck)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinAttributesMapper m) => m.SqlDelete(sql, sqlCheck));
+		}
+
 		public void Subselect(string sql)
 		{
 			CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinAttributesMapper m) => m.Subselect(sql));

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

@@ -92,16 +92,31 @@ public void SqlInsert(string sql)
 			CustomizersHolder.AddCustomizer(typeof (TEntity), (IJoinedSubclassAttributesMapper m) => m.SqlInsert(sql));
 		}
 
+		public void SqlInsert(string sql, SqlCheck sqlCheck)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinedSubclassAttributesMapper m) => m.SqlInsert(sql, sqlCheck));
+		}
+
 		public void SqlUpdate(string sql)
 		{
 			CustomizersHolder.AddCustomizer(typeof (TEntity), (IJoinedSubclassAttributesMapper m) => m.SqlUpdate(sql));
 		}
 
+		public void SqlUpdate(string sql, SqlCheck sqlCheck)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinedSubclassAttributesMapper m) => m.SqlUpdate(sql, sqlCheck));
+		}
+
 		public void SqlDelete(string sql)
 		{
 			CustomizersHolder.AddCustomizer(typeof (TEntity), (IJoinedSubclassAttributesMapper m) => m.SqlDelete(sql));
 		}
 
+		public void SqlDelete(string sql, SqlCheck sqlCheck)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinedSubclassAttributesMapper m) => m.SqlDelete(sql, sqlCheck));
+		}
+
 		public void Subselect(string sql)
 		{
 			CustomizersHolder.AddCustomizer(typeof (TEntity), (IJoinedSubclassAttributesMapper m) => m.Subselect(sql));
@@ -140,10 +155,10 @@ public void Schema(string schemaName)
 			CustomizersHolder.AddCustomizer(typeof (TEntity), (IJoinedSubclassAttributesMapper m) => m.Schema(schemaName));
 		}
 
-        public void Filter(string filterName, Action<IFilterMapper> filterMapping)
-        {
-            CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinedSubclassAttributesMapper m) => m.Filter(filterName, filterMapping));
-        }
+		public void Filter(string filterName, Action<IFilterMapper> filterMapping)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinedSubclassAttributesMapper m) => m.Filter(filterName, filterMapping));
+		}
 
 		#endregion
 

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

@@ -129,16 +129,31 @@ public void SqlInsert(string sql)
 			CustomizersHolder.AddCustomizer(typeof (TEntity), (ISubclassMapper m) => m.SqlInsert(sql));
 		}
 
+		public void SqlInsert(string sql, SqlCheck sqlCheck)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (ISubclassMapper m) => m.SqlInsert(sql, sqlCheck));
+		}
+
 		public void SqlUpdate(string sql)
 		{
 			CustomizersHolder.AddCustomizer(typeof (TEntity), (ISubclassMapper m) => m.SqlUpdate(sql));
 		}
 
+		public void SqlUpdate(string sql, SqlCheck sqlCheck)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (ISubclassMapper m) => m.SqlUpdate(sql, sqlCheck));
+		}
+
 		public void SqlDelete(string sql)
 		{
 			CustomizersHolder.AddCustomizer(typeof (TEntity), (ISubclassMapper m) => m.SqlDelete(sql));
 		}
 
+		public void SqlDelete(string sql, SqlCheck sqlCheck)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (ISubclassMapper m) => m.SqlDelete(sql, sqlCheck));
+		}
+
 		public void Subselect(string sql)
 		{
 			CustomizersHolder.AddCustomizer(typeof (TEntity), (ISubclassMapper m) => m.Subselect(sql));

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

@@ -79,16 +79,31 @@ public void SqlInsert(string sql)
 			CustomizersHolder.AddCustomizer(typeof (TEntity), (IUnionSubclassAttributesMapper m) => m.SqlInsert(sql));
 		}
 
+		public void SqlInsert(string sql, SqlCheck sqlCheck)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (IUnionSubclassAttributesMapper m) => m.SqlInsert(sql, sqlCheck));
+		}
+
 		public void SqlUpdate(string sql)
 		{
 			CustomizersHolder.AddCustomizer(typeof (TEntity), (IUnionSubclassAttributesMapper m) => m.SqlUpdate(sql));
 		}
 
+		public void SqlUpdate(string sql, SqlCheck sqlCheck)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (IUnionSubclassAttributesMapper m) => m.SqlUpdate(sql, sqlCheck));
+		}
+
 		public void SqlDelete(string sql)
 		{
 			CustomizersHolder.AddCustomizer(typeof (TEntity), (IUnionSubclassAttributesMapper m) => m.SqlDelete(sql));
 		}
 
+		public void SqlDelete(string sql, SqlCheck sqlCheck)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (IUnionSubclassAttributesMapper m) => m.SqlDelete(sql, sqlCheck));
+		}
+
 		public void Subselect(string sql)
 		{
 			CustomizersHolder.AddCustomizer(typeof (TEntity), (IUnionSubclassAttributesMapper m) => m.Subselect(sql));