Add session filter support for DML statement

.editorconfig

@@ -30,3 +30,6 @@ indent_size = 2
 [*.cshtml]
 indent_style = space
 indent_size = 4
+
+[*.g]
+indent_style = tab

src/NHibernate.Test/Async/NHSpecificTest/GH1921/Fixture.cs

@@ -0,0 +1,172 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.GH1921
+{
+	using System.Threading.Tasks;
+	using System.Threading;
+	[TestFixture]
+	public class FixtureAsync : BugTestCase
+	{
+		protected override bool AppliesTo(Dialect.Dialect dialect)
+		{
+			return TestDialect.NativeGeneratorSupportsBulkInsertion;
+		}
+
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var e1 = new Entity { Name = "Bob" };
+				session.Save(e1);
+
+				var e2 = new Entity { Name = "Sally" };
+				session.Save(e2);
+
+				var me1 = new MultiTableEntity { Name = "Bob", OtherName = "Bob" };
+				session.Save(me1);
+
+				var me2 = new MultiTableEntity { Name = "Sally", OtherName = "Sally" };
+				session.Save(me2);
+
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.CreateQuery("delete from System.Object").ExecuteUpdate();
+
+				transaction.Commit();
+			}
+		}
+
+		[Theory]
+		public async Task DmlInsertAsync(bool filtered)
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				if (filtered)
+					session.EnableFilter("NameFilter").SetParameter("name", "Bob");
+				var rowCount = await (session.CreateQuery("insert into Entity (Name) select e.Name from Entity e")
+				                      .ExecuteUpdateAsync());
+				await (transaction.CommitAsync());
+
+				Assert.That(rowCount, Is.EqualTo(filtered ? 1 : 2));
+			}
+		}
+
+		[Theory]
+		public async Task DmlUpdateAsync(bool filtered)
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				if (filtered)
+					session.EnableFilter("NameFilter").SetParameter("name", "Bob");
+				var rowCount = await (session.CreateQuery("update Entity e set Name = 'newName'").ExecuteUpdateAsync());
+				await (transaction.CommitAsync());
+
+				Assert.That(rowCount, Is.EqualTo(filtered ? 1 : 2));
+			}
+		}
+
+		[Theory]
+		public async Task DmlDeleteAsync(bool filtered)
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				if (filtered)
+					session.EnableFilter("NameFilter").SetParameter("name", "Bob");
+				var rowCount = await (session.CreateQuery("delete Entity").ExecuteUpdateAsync());
+				await (transaction.CommitAsync());
+
+				Assert.That(rowCount, Is.EqualTo(filtered ? 1 : 2));
+			}
+		}
+
+		[TestCase(null)]
+		[TestCase("NameFilter")]
+		[TestCase("OtherNameFilter", IgnoreReason = "Not supported")]
+		public async Task MultiTableDmlInsertAsync(string filter, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				if (!string.IsNullOrEmpty(filter))
+					session.EnableFilter(filter).SetParameter("name", "Bob");
+				var rowCount =
+					await (session
+						.CreateQuery(
+							// No insert of OtherName: not supported (INSERT statements cannot refer to superclass/joined properties)
+							"insert into MultiTableEntity (Name) select e.Name from Entity e")
+						.ExecuteUpdateAsync(cancellationToken));
+				await (transaction.CommitAsync(cancellationToken));
+
+				Assert.That(rowCount, Is.EqualTo(string.IsNullOrEmpty(filter) ? 2 : 1));
+			}
+		}
+
+		[TestCase(null)]
+		[TestCase("NameFilter")]
+		[TestCase("OtherNameFilter")]
+		public async Task MultiTableDmlUpdateAsync(string filter, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				if (!string.IsNullOrEmpty(filter))
+					session.EnableFilter(filter).SetParameter("name", "Bob");
+				var rowCount =
+					await (session
+						.CreateQuery(
+							"update MultiTableEntity e" +
+							" set Name = 'newName', OtherName = 'newOtherName'" +
+							// Check referencing columns is supported
+							" where e.Name is not null and e.OtherName is not null")
+						.ExecuteUpdateAsync(cancellationToken));
+				await (transaction.CommitAsync(cancellationToken));
+
+				Assert.That(rowCount, Is.EqualTo(string.IsNullOrEmpty(filter) ? 2 : 1));
+			}
+		}
+
+		[TestCase(null)]
+		[TestCase("NameFilter")]
+		[TestCase("OtherNameFilter")]
+		public async Task MultiTableDmlDeleteAsync(string filter, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				if (!string.IsNullOrEmpty(filter))
+					session.EnableFilter(filter).SetParameter("name", "Bob");
+				var rowCount =
+					await (session
+						.CreateQuery(
+							"delete MultiTableEntity e" +
+							// Check referencing columns is supported
+							" where e.Name is not null and e.OtherName is not null")
+						.ExecuteUpdateAsync(cancellationToken));
+				await (transaction.CommitAsync(cancellationToken));
+
+				Assert.That(rowCount, Is.EqualTo(string.IsNullOrEmpty(filter) ? 2 : 1));
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/GH1921/Entity.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.GH1921
+{
+	class Entity
+	{
+		public virtual int Id { get; set; }
+		public virtual string Name { get; set; }
+	}
+
+	class MultiTableEntity
+	{
+		public virtual int Id { get; set; }
+		public virtual string Name { get; set; }
+		public virtual string OtherName { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/GH1921/Fixture.cs

@@ -0,0 +1,160 @@
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.GH1921
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override bool AppliesTo(Dialect.Dialect dialect)
+		{
+			return TestDialect.NativeGeneratorSupportsBulkInsertion;
+		}
+
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var e1 = new Entity { Name = "Bob" };
+				session.Save(e1);
+
+				var e2 = new Entity { Name = "Sally" };
+				session.Save(e2);
+
+				var me1 = new MultiTableEntity { Name = "Bob", OtherName = "Bob" };
+				session.Save(me1);
+
+				var me2 = new MultiTableEntity { Name = "Sally", OtherName = "Sally" };
+				session.Save(me2);
+
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.CreateQuery("delete from System.Object").ExecuteUpdate();
+
+				transaction.Commit();
+			}
+		}
+
+		[Theory]
+		public void DmlInsert(bool filtered)
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				if (filtered)
+					session.EnableFilter("NameFilter").SetParameter("name", "Bob");
+				var rowCount = session.CreateQuery("insert into Entity (Name) select e.Name from Entity e")
+				                      .ExecuteUpdate();
+				transaction.Commit();
+
+				Assert.That(rowCount, Is.EqualTo(filtered ? 1 : 2));
+			}
+		}
+
+		[Theory]
+		public void DmlUpdate(bool filtered)
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				if (filtered)
+					session.EnableFilter("NameFilter").SetParameter("name", "Bob");
+				var rowCount = session.CreateQuery("update Entity e set Name = 'newName'").ExecuteUpdate();
+				transaction.Commit();
+
+				Assert.That(rowCount, Is.EqualTo(filtered ? 1 : 2));
+			}
+		}
+
+		[Theory]
+		public void DmlDelete(bool filtered)
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				if (filtered)
+					session.EnableFilter("NameFilter").SetParameter("name", "Bob");
+				var rowCount = session.CreateQuery("delete Entity").ExecuteUpdate();
+				transaction.Commit();
+
+				Assert.That(rowCount, Is.EqualTo(filtered ? 1 : 2));
+			}
+		}
+
+		[TestCase(null)]
+		[TestCase("NameFilter")]
+		[TestCase("OtherNameFilter", IgnoreReason = "Not supported")]
+		public void MultiTableDmlInsert(string filter)
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				if (!string.IsNullOrEmpty(filter))
+					session.EnableFilter(filter).SetParameter("name", "Bob");
+				var rowCount =
+					session
+						.CreateQuery(
+							// No insert of OtherName: not supported (INSERT statements cannot refer to superclass/joined properties)
+							"insert into MultiTableEntity (Name) select e.Name from Entity e")
+						.ExecuteUpdate();
+				transaction.Commit();
+
+				Assert.That(rowCount, Is.EqualTo(string.IsNullOrEmpty(filter) ? 2 : 1));
+			}
+		}
+
+		[TestCase(null)]
+		[TestCase("NameFilter")]
+		[TestCase("OtherNameFilter")]
+		public void MultiTableDmlUpdate(string filter)
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				if (!string.IsNullOrEmpty(filter))
+					session.EnableFilter(filter).SetParameter("name", "Bob");
+				var rowCount =
+					session
+						.CreateQuery(
+							"update MultiTableEntity e" +
+							" set Name = 'newName', OtherName = 'newOtherName'" +
+							// Check referencing columns is supported
+							" where e.Name is not null and e.OtherName is not null")
+						.ExecuteUpdate();
+				transaction.Commit();
+
+				Assert.That(rowCount, Is.EqualTo(string.IsNullOrEmpty(filter) ? 2 : 1));
+			}
+		}
+
+		[TestCase(null)]
+		[TestCase("NameFilter")]
+		[TestCase("OtherNameFilter")]
+		public void MultiTableDmlDelete(string filter)
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				if (!string.IsNullOrEmpty(filter))
+					session.EnableFilter(filter).SetParameter("name", "Bob");
+				var rowCount =
+					session
+						.CreateQuery(
+							"delete MultiTableEntity e" +
+							// Check referencing columns is supported
+							" where e.Name is not null and e.OtherName is not null")
+						.ExecuteUpdate();
+				transaction.Commit();
+
+				Assert.That(rowCount, Is.EqualTo(string.IsNullOrEmpty(filter) ? 2 : 1));
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/GH1921/Mappings.hbm.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.GH1921">
+
+  <class name="Entity">
+    <id name="Id" generator="native"/>
+    <property name="Name"/>
+
+    <filter name="NameFilter"/>
+  </class>
+
+  <class name="MultiTableEntity">
+    <id name="Id" generator="native"/>
+    <property name="Name"/>
+
+    <join table="SecondTable">
+      <key column="Id"/>
+      <property name="OtherName"/>
+    </join>
+
+    <filter name="NameFilter"/>
+    <filter name="OtherNameFilter"/>
+  </class>
+
+  <filter-def name="NameFilter" condition="Name = :name">
+    <filter-param name="name" type="System.String"/>
+  </filter-def>
+
+  <filter-def name="OtherNameFilter" condition="OtherName = :name">
+    <filter-param name="name" type="System.String"/>
+  </filter-def>
+</hibernate-mapping>