From aaae17d31bec1e6381ef68ebc57f0d46b2351cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?=
 <12201973+fredericdelaporte@users.noreply.github.com>
Date: Tue, 26 Jun 2018 16:13:49 +0200
Subject: [PATCH 1/2] Start/Stop required db-service for TeamCity

(cherry picked from commit 190fe3c60ffd99a22805be241330fadb74f0177b)
---
 teamcity.build | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/teamcity.build b/teamcity.build
index 7a5c05a4d2f..69a4216d044 100644
--- a/teamcity.build
+++ b/teamcity.build
@@ -3,6 +3,7 @@
 
 	<property name="root.dir" value="." />
 	<property name="config.teamcity" value="default"/>
+	<property name="skip.db-service" value="true" overwrite="false" />
 
 	<include buildfile="${root.dir}/default.build" />
 
@@ -12,7 +13,15 @@
 
 	<property name="build.number" value="${CCNetLabel}" if="${property::exists('CCNetLabel')}" />
 
-	<target name="clean-configure-test" depends="cleanall init copy-teamcity-configuration binaries test verify-test-results binaries-zip" />
+	<target name="clean-configure-test" depends="cleanall init copy-teamcity-configuration binaries start-db-service test stop-db-service verify-test-results binaries-zip" />
+
+	<target name="start-db-service" unless="${skip.db-service or not property::exists('db-service')}">
+		<servicecontroller action="Start" service="${db-service}" timeout="120000" />
+	</target>
+
+	<target name="stop-db-service" unless="${skip.db-service or not property::exists('db-service')}">
+		<servicecontroller action="Stop" service="${db-service}" timeout="120000" />
+	</target>
 
 	<target name="copy-teamcity-configuration">
 		<copy file="build-common/teamcity-hibernate.cfg.xml" tofile="${bin.dir}/hibernate.cfg.xml" />
@@ -32,10 +41,12 @@
 	</target>
 
 	<target name="setup-teamcity-default">
+		<property name="db-service" value="MSSQL$SQLEXPRESS" />
 		<!-- default (SQL Server) does not require any additional settings/binaries -->
 	</target>
 
 	<target name="setup-teamcity-sqlServerOdbc">
+		<property name="db-service" value="MSSQL$SQLEXPRESS" />
 		<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.OdbcDriver" />
 		<property name="nhibernate.odbc.explicit_datetime_scale" value="3" />
 	<!-- We need to use a dialect that avoids mapping DbType.Time to TIME on MSSQL. On modern SQL Server
@@ -51,10 +62,12 @@
 	</target>
 
 	<target name="setup-teamcity-sqlServer-Sql2008ClientDriver">
+		<property name="db-service" value="MSSQL$SQLEXPRESS" />
 		<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.Sql2008ClientDriver" />
 	</target>
 
 	<target name="setup-teamcity-sqlServer2012">
+		<property name="db-service" value="MSSQL$SQLEXPRESS" />
 		<property name="nhibernate.dialect" value="NHibernate.Dialect.MsSql2012Dialect" />
 	</target>
 
@@ -74,12 +87,14 @@
 	</target>
 
 	<target name="setup-teamcity-firebird32">
+		<property name="db-service" value="FirebirdServerDefaultInstance" />
 		<property name="nhibernate.connection.driver_class"			value="NHibernate.Driver.FirebirdClientDriver" />
 		<property name="nhibernate.dialect"							value="NHibernate.Dialect.FirebirdDialect" />
 		<property name="nhibernate.connection.connection_string"	value="DataSource=localhost;Database=nhibernate;User ID=SYSDBA;Password=masterkey;MaxPoolSize=200;" />
 	</target>
 
 	<target name="setup-teamcity-firebird64">
+		<property name="db-service" value="FirebirdServerDefaultInstance" />
 		<property name="nunit-x64" value="true" />
 		<property name="nhibernate.connection.driver_class"			value="NHibernate.Driver.FirebirdClientDriver" />
 		<property name="nhibernate.dialect"							value="NHibernate.Dialect.FirebirdDialect" />
@@ -108,12 +123,14 @@
 	</target>
 
 	<target name="setup-teamcity-postgresql">
+		<property name="db-service" value="postgresql-x64-10" />
 		<property name="nhibernate.connection.driver_class"			value="NHibernate.Driver.NpgsqlDriver" />
 		<property name="nhibernate.dialect"							value="NHibernate.Dialect.PostgreSQL83Dialect" />
 		<property name="nhibernate.connection.connection_string"	value="Host=localhost;Port=5432;Database=nhibernate;Username=nhibernate;Password=nhibernate;Enlist=true" />
 	</target>
 
 	<target name="setup-teamcity-oracle">
+		<property name="db-service" value="OracleServiceXE" />
 		<property name="nhibernate.connection.driver_class"			value="NHibernate.Driver.OracleClientDriver" />
 		<property name="nhibernate.dialect"							value="NHibernate.Dialect.Oracle10gDialect" />
 		<property name="nhibernate.connection.connection_string"	value="User ID=nhibernate;Password=nhibernate;Data Source=XE" />
@@ -122,6 +139,7 @@
 	</target>
 
 	<target name="setup-teamcity-oracle32">
+		<property name="db-service" value="OracleServiceXE" />
 		<property name="nhibernate.connection.driver_class"			value="NHibernate.Driver.OracleDataClientDriver" />
 		<property name="nhibernate.dialect"							value="NHibernate.Dialect.Oracle10gDialect" />
 		<property name="nhibernate.connection.connection_string"	value="User ID=nhibernate;Password=nhibernate;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))" />
@@ -137,6 +155,7 @@
 	</target>
 
 	<target name="setup-teamcity-oracle64">
+		<property name="db-service" value="OracleServiceXE" />
 		<property name="nunit-x64" value="true" />
 		<property name="nhibernate.connection.driver_class"			value="NHibernate.Driver.OracleDataClientDriver" />
 		<property name="nhibernate.dialect"							value="NHibernate.Dialect.Oracle10gDialect" />
@@ -153,6 +172,7 @@
 	</target>
 
 	<target name="setup-teamcity-oracle-managed32">
+		<property name="db-service" value="OracleServiceXE" />
 		<property name="nhibernate.connection.driver_class"			value="NHibernate.Driver.OracleManagedDataClientDriver" />
 		<property name="nhibernate.dialect"							value="NHibernate.Dialect.Oracle10gDialect" />
 		<property name="nhibernate.connection.connection_string"	value="User ID=nhibernate;Password=nhibernate;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XE)))" />
@@ -161,6 +181,7 @@
 	</target>
 
 	<target name="setup-teamcity-oracle-managed64">
+		<property name="db-service" value="OracleServiceXE" />
 		<property name="nunit-x64" value="true" />
 		<property name="nhibernate.connection.driver_class"			value="NHibernate.Driver.OracleManagedDataClientDriver" />
 		<property name="nhibernate.dialect"							value="NHibernate.Dialect.Oracle10gDialect" />
@@ -170,6 +191,7 @@
 	</target>
 
 	<target name="setup-teamcity-mysql">
+		<property name="db-service" value="MySQL57" />
 		<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.MySqlDataDriver" />
 		<property name="nhibernate.dialect"	value="NHibernate.Dialect.MySQL5Dialect" />
 		<property name="nhibernate.connection.connection_string" value="Data Source=localhost;Database=nhibernate;User ID=nhibernate;Password=nhibernate;Protocol=memory;Old Guids=True;" />

From 1c474ff8aeb4403b52b7bbaceb57b8e649381bd7 Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Tue, 26 Feb 2019 17:29:31 +0100
Subject: [PATCH 2/2] Throw for LINQ DML on filter

---
 .../Async/LinqBulkManipulation/Fixture.cs          | 14 +++++++++++++-
 .../LinqBulkManipulation/Fixture.cs                | 14 +++++++++++++-
 src/NHibernate/Async/Linq/DefaultQueryProvider.cs  |  3 +++
 src/NHibernate/Linq/DefaultQueryProvider.cs        |  3 +++
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/NHibernate.Test/Async/LinqBulkManipulation/Fixture.cs b/src/NHibernate.Test/Async/LinqBulkManipulation/Fixture.cs
index 37f5b248623..50746e95a21 100644
--- a/src/NHibernate.Test/Async/LinqBulkManipulation/Fixture.cs
+++ b/src/NHibernate.Test/Async/LinqBulkManipulation/Fixture.cs
@@ -1158,6 +1158,18 @@ public async Task DeleteSyntaxWithCompositeIdAsync()
 			}
 		}
 
+		[Test]
+		public async Task DeleteOnFilterThrowsAsync()
+		{
+			using (var s = OpenSession())
+			using (s.BeginTransaction())
+			{
+				var a = await (s.Query<SimpleEntityWithAssociation>().Take(1).SingleOrDefaultAsync());
+				var query = a.AssociatedEntities.AsQueryable();
+				Assert.That(() => query.Delete(), Throws.InstanceOf<NotSupportedException>());
+			}
+		}
+
 		#endregion
 	}
-}
\ No newline at end of file
+}
diff --git a/src/NHibernate.Test/LinqBulkManipulation/Fixture.cs b/src/NHibernate.Test/LinqBulkManipulation/Fixture.cs
index c376163051d..fd514dee36d 100644
--- a/src/NHibernate.Test/LinqBulkManipulation/Fixture.cs
+++ b/src/NHibernate.Test/LinqBulkManipulation/Fixture.cs
@@ -1199,6 +1199,18 @@ public void DeleteOnProjectionThrows()
 			}
 		}
 
+		[Test]
+		public void DeleteOnFilterThrows()
+		{
+			using (var s = OpenSession())
+			using (s.BeginTransaction())
+			{
+				var a = s.Query<SimpleEntityWithAssociation>().Take(1).SingleOrDefault();
+				var query = a.AssociatedEntities.AsQueryable();
+				Assert.That(() => query.Delete(), Throws.InstanceOf<NotSupportedException>());
+			}
+		}
+
 		#endregion
 	}
-}
\ No newline at end of file
+}
diff --git a/src/NHibernate/Async/Linq/DefaultQueryProvider.cs b/src/NHibernate/Async/Linq/DefaultQueryProvider.cs
index 87053fcb45c..f8447be888a 100644
--- a/src/NHibernate/Async/Linq/DefaultQueryProvider.cs
+++ b/src/NHibernate/Async/Linq/DefaultQueryProvider.cs
@@ -58,12 +58,15 @@ protected virtual async Task<object> ExecuteQueryAsync(NhLinqExpression nhLinqEx
 
 		public Task<int> ExecuteDmlAsync<T>(QueryMode queryMode, Expression expression, CancellationToken cancellationToken)
 		{
+			if (Collection != null)
+				throw new NotSupportedException("DML operations are not supported for filters.");
 			if (cancellationToken.IsCancellationRequested)
 			{
 				return Task.FromCanceled<int>(cancellationToken);
 			}
 			try
 			{
+
 				var nhLinqExpression = new NhLinqDmlExpression<T>(queryMode, expression, Session.Factory);
 
 				var query = Session.CreateQuery(nhLinqExpression);
diff --git a/src/NHibernate/Linq/DefaultQueryProvider.cs b/src/NHibernate/Linq/DefaultQueryProvider.cs
index 57bd1f18513..66c245c797e 100644
--- a/src/NHibernate/Linq/DefaultQueryProvider.cs
+++ b/src/NHibernate/Linq/DefaultQueryProvider.cs
@@ -220,6 +220,9 @@ public virtual void SetResultTransformerAndAdditionalCriteria(IQuery query, NhLi
 
 		public int ExecuteDml<T>(QueryMode queryMode, Expression expression)
 		{
+			if (Collection != null)
+				throw new NotSupportedException("DML operations are not supported for filters.");
+
 			var nhLinqExpression = new NhLinqDmlExpression<T>(queryMode, expression, Session.Factory);
 
 			var query = Session.CreateQuery(nhLinqExpression);