Skip to content

Commit cc2f1b2

Browse files
committed
Backport fix for NH-3239
- Update re-linq to version 1.13.171 - this makes NameUnNamedParameters visitor obsolete - Uncomment dynamic linq test. - Don't sign test assemblies
1 parent 72ccb38 commit cc2f1b2

File tree

9 files changed

+4174
-58
lines changed

9 files changed

+4174
-58
lines changed

lib/net/3.5/Remotion.Linq.dll

3 KB
Binary file not shown.

lib/net/3.5/Remotion.Linq.pdb

12 KB
Binary file not shown.

lib/net/3.5/Remotion.Linq.xml

Lines changed: 4147 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.build

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<property name="assembly.description" value="The Visual Basic Unit Tests for NHibernate." />
1111
<property name="assembly.is-cls-compliant" value="false" />
1212
<property name="clover.instrument" value="false" />
13-
<assemblyfileset id="project.references" basedir="${bin.dir}">
13+
<property name="sign" value="false" />
14+
<assemblyfileset id="project.references" basedir="${bin.dir}">
1415
<include name="System.dll" />
1516
<include name="System.Core.dll" />
1617
<include name="System.Transactions.dll" />
Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using System;
21
using System.Linq;
3-
//using System.Linq.Dynamic;
4-
using NHibernate.DomainModel.Northwind.Entities;
2+
using System.Linq.Dynamic;
3+
using NHibernate.Linq;
54
using NUnit.Framework;
65

76
namespace NHibernate.Test.Linq
@@ -10,26 +9,33 @@ namespace NHibernate.Test.Linq
109
public class DynamicQueryTests : LinqTestCase
1110
{
1211
[Test]
13-
[Ignore("TODO - works locally, but gives compile errors on teamcity")]
1412
public void CanQueryWithDynamicOrderBy()
1513
{
16-
/*
17-
var query = from user in db.Users
18-
select user;
14+
//dynamic orderby clause
15+
var list = db.Users
16+
.OrderBy("RegisteredAt")
17+
.ToList();
18+
19+
Assert.That(list, Is.Ordered.By("RegisteredAt"));
20+
}
1921

22+
[Test(Description = "NH-3239")]
23+
public void CanCahceDynamicLinq()
24+
{
2025
//dynamic orderby clause
21-
query = query.OrderBy("RegisteredAt");
26+
var users = db.Users
27+
.Cacheable()
28+
.Fetch(x => x.Role)
29+
.OrderBy("RegisteredAt");
2230

23-
var list = query.ToList();
31+
users
32+
.ToList();
2433

25-
//assert list was returned in order
26-
DateTime previousDate = DateTime.MinValue;
27-
list.Each(delegate(User user)
34+
using (var log = new SqlLogSpy())
2835
{
29-
Assert.IsTrue(previousDate <= user.RegisteredAt);
30-
previousDate = user.RegisteredAt;
31-
});
32-
*/
36+
users.ToList();
37+
Assert.IsNullOrEmpty(log.GetWholeLog());
38+
}
3339
}
3440
}
3541
}

src/NHibernate.Test/NHibernate.Test.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<property name="assembly.description" value="The Unit Tests for NHibernate." />
1111
<property name="assembly.is-cls-compliant" value="false" />
1212
<property name="clover.instrument" value="false" />
13+
<property name="sign" value="false" />
1314
<assemblyfileset id="project.references" basedir="${bin.dir}">
1415
<include name="System.dll" />
1516
<include name="System.Core.dll" />

src/NHibernate.TestDatabaseSetup/TestDatabaseSetup.build

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
<property name="assembly.description" value="Test Database Setup for NHibernate." />
88
<property name="assembly.is-cls-compliant" value="true" />
99
<property name="clover.instrument" value="false" />
10-
<copy file="${root.dir}/lib/teamcity/firebird/FirebirdSql.Data.FirebirdClient.dll" todir="${bin.dir}" />
10+
<property name="sign" value="false" />
11+
<copy file="${root.dir}/lib/teamcity/firebird/FirebirdSql.Data.FirebirdClient.dll" todir="${bin.dir}" />
1112
<copy file="${root.dir}/lib/teamcity/postgresql/Npgsql.dll" todir="${bin.dir}" />
1213
<assemblyfileset id="project.references" basedir="${bin.dir}">
1314
<include name="System.dll" />

src/NHibernate/Linq/NhLinqExpression.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public class NhLinqExpression : IQueryExpression
3030
public NhLinqExpression(Expression expression, ISessionFactory sessionFactory)
3131
{
3232
_expression = NhPartialEvaluatingExpressionTreeVisitor.EvaluateIndependentSubtrees(expression);
33-
_expression = NameUnNamedParameters.Visit(_expression);
3433

3534
_constantToParameterMap = ExpressionParameterVisitor.Visit(_expression, sessionFactory);
3635

src/NHibernate/Linq/Visitors/NameUnNamedParameters.cs

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)