Skip to content

Commit e444607

Browse files
committed
Fix previously not supported test
1 parent 2644ef7 commit e444607

File tree

4 files changed

+20
-3
lines changed

4 files changed

+20
-3
lines changed

src/NHibernate.Test/Async/NHSpecificTest/GH1879/FixtureByCode.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using System.Collections.Generic;
1313
using System.Linq;
1414
using NHibernate.Cfg.MappingSchema;
15+
using NHibernate.Exceptions;
1516
using NHibernate.Mapping.ByCode;
1617
using NHibernate.Type;
1718
using NUnit.Framework;
@@ -124,8 +125,7 @@ protected async Task AreEqualAsync<TResult>(
124125
{
125126
expectedResult = await (expectedQuery(session.Query<T>()).ToListAsync(cancellationToken));
126127
}
127-
catch (OperationCanceledException) { throw; }
128-
catch (Exception e)
128+
catch (GenericADOException e)
129129
{
130130
Assert.Ignore($"Not currently supported query: {e}");
131131
}

src/NHibernate.Test/NHSpecificTest/GH1879/FixtureByCode.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using NHibernate.Cfg.MappingSchema;
5+
using NHibernate.Exceptions;
56
using NHibernate.Mapping.ByCode;
67
using NHibernate.Type;
78
using NUnit.Framework;
@@ -111,7 +112,7 @@ protected void AreEqual<TResult>(
111112
{
112113
expectedResult = expectedQuery(session.Query<T>()).ToList();
113114
}
114-
catch (Exception e)
115+
catch (GenericADOException e)
115116
{
116117
Assert.Ignore($"Not currently supported query: {e}");
117118
}

src/NHibernate/Linq/ReWriters/ConditionalQueryReferenceExpander.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@ public override void VisitSelectClause(SelectClause selectClause, QueryModel que
3131
_expander.Transform(selectClause);
3232
}
3333

34+
public override void VisitMainFromClause(MainFromClause fromClause, QueryModel queryModel)
35+
{
36+
if (fromClause.FromExpression is SubQueryExpression subqueryExpression)
37+
{
38+
VisitQueryModel(subqueryExpression.QueryModel);
39+
}
40+
}
41+
3442
public override void VisitOrdering(Ordering ordering, QueryModel queryModel, OrderByClause orderByClause, int index)
3543
{
3644
_expander.Transform(ordering);

src/NHibernate/Linq/ReWriters/SubQueryConditionalExpander.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ public override void VisitSelectClause(SelectClause selectClause, QueryModel que
2424
_expander.Transform(selectClause);
2525
}
2626

27+
public override void VisitMainFromClause(MainFromClause fromClause, QueryModel queryModel)
28+
{
29+
if (fromClause.FromExpression is SubQueryExpression subqueryExpression)
30+
{
31+
VisitQueryModel(subqueryExpression.QueryModel);
32+
}
33+
}
34+
2735
public override void VisitOrdering(Ordering ordering, QueryModel queryModel, OrderByClause orderByClause, int index)
2836
{
2937
_expander.Transform(ordering);

0 commit comments

Comments
 (0)