Skip to content

Throw for DML on filter #2035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 13, 2019
Merged

Throw for DML on filter #2035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaae17d
Start/Stop required db-service for TeamCity
fredericDelaporte Jun 26, 2018
1c474ff
Throw for LINQ DML on filter
bahusoid Feb 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/NHibernate.Test/Async/LinqBulkManipulation/Fixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
14 changes: 13 additions & 1 deletion src/NHibernate.Test/LinqBulkManipulation/Fixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
3 changes: 3 additions & 0 deletions src/NHibernate/Async/Linq/DefaultQueryProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions src/NHibernate/Linq/DefaultQueryProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
24 changes: 23 additions & 1 deletion teamcity.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

Expand All @@ -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" />
Expand All @@ -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
Expand All @@ -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>

Expand All @@ -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" />
Expand Down Expand Up @@ -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" />
Expand All @@ -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)))" />
Expand All @@ -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" />
Expand All @@ -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)))" />
Expand All @@ -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" />
Expand All @@ -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;" />
Expand Down