Skip to content

Commit fffd3c5

Browse files
bahusoidbahusoid
committed
Interface changes
1 parent a49c739 commit fffd3c5

File tree

7 files changed

+134
-48
lines changed

7 files changed

+134
-48
lines changed

‎src/NHibernate.Test/Async/Criteria/EntityJoinCriteriaTest.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public async Task CanJoinNotAssociatedEntityAsync()
3939
EntityComplex entityComplex = null;
4040
EntityWithNoAssociation root = null;
4141
root = await (session.QueryOver<EntityWithNoAssociation>(() => root)
42-
.JoinEntityAlias(() => entityComplex, JoinType.InnerJoin, Restrictions.Where(() => root.Complex1Id == entityComplex.Id)).Take(1)
42+
.JoinEntityAlias(() => entityComplex, Restrictions.Where(() => root.Complex1Id == entityComplex.Id), JoinType.InnerJoin).Take(1)
4343
.SingleOrDefaultAsync());
4444
entityComplex = await (session.LoadAsync<EntityComplex>(root.Complex1Id));
4545

@@ -58,7 +58,7 @@ public async Task CanJoinEntityQueryOverAsync()
5858
EntityComplex ejQueryOver = null;
5959
EntityWithNoAssociation root = null;
6060
root = await (session.QueryOver<EntityWithNoAssociation>(() => root)
61-
.JoinEntityQueryOver( ()=> ejQueryOver, JoinType.InnerJoin, Restrictions.Where(() => root.Complex1Id == ejQueryOver.Id))
61+
.JoinEntityQueryOver(() => ejQueryOver, Restrictions.Where(() => root.Complex1Id == ejQueryOver.Id), JoinType.InnerJoin)
6262
.Take(1)
6363
.SingleOrDefaultAsync());
6464
ejQueryOver = await (session.LoadAsync<EntityComplex>(root.Complex1Id));
@@ -78,7 +78,7 @@ public async Task CanQueryOverForAssociationInNotAssociatedEntityAsync()
7878
EntityComplex ejComplex = null;
7979
EntityWithNoAssociation root = null;
8080
root = await (session.QueryOver<EntityWithNoAssociation>(() => root)
81-
.JoinEntityQueryOver( ()=> ejComplex, JoinType.InnerJoin, Restrictions.Where(() => root.Complex1Id == ejComplex.Id))
81+
.JoinEntityQueryOver(() => ejComplex, Restrictions.Where(() => root.Complex1Id == ejComplex.Id), JoinType.InnerJoin)
8282
.JoinQueryOver(ej => ej.Child1)
8383
.Take(1)
8484
.SingleOrDefaultAsync());
@@ -101,7 +101,7 @@ public async Task SimpleProjectionForEntityJoinAsync()
101101
EntityComplex ejComplex = null;
102102
EntityWithNoAssociation root = null;
103103
var name = await (session.QueryOver<EntityWithNoAssociation>(() => root)
104-
.JoinEntityQueryOver(() => ejComplex, JoinType.InnerJoin, Restrictions.Where(() => root.Complex1Id == ejComplex.Id))
104+
.JoinEntityQueryOver(() => ejComplex, Restrictions.Where(() => root.Complex1Id == ejComplex.Id), JoinType.InnerJoin)
105105
.Select((e) => ejComplex.Name)
106106
.Take(1)
107107
.SingleOrDefaultAsync<string>());
@@ -124,7 +124,7 @@ public async Task EntityProjectionForEntityJoinAsync()
124124
var r = await (session
125125
.QueryOver<EntityComplex>(() => root)
126126
.JoinAlias(c => c.SameTypeChild, () => st)
127-
.JoinEntityAlias(() => ejChild1, JoinType.InnerJoin, Restrictions.Where(() => ejChild1.Id == root.Child1.Id))
127+
.JoinEntityAlias(() => ejChild1, Restrictions.Where(() => ejChild1.Id == root.Child1.Id), JoinType.InnerJoin)
128128
.Select(
129129
Projections.RootEntity(),
130130
Projections.Entity(() => st),
@@ -159,10 +159,10 @@ public async Task MixOfJoinsForAssociatedAndNotAssociatedEntitiesAsync()
159159
EntitySimpleChild ejLevel2OnEntityComplexForEjLevel1 = null;
160160
var obj = await (session
161161
.QueryOver<EntityComplex>(() => root)
162-
.JoinEntityAlias(() => ejLevel1, JoinType.LeftOuterJoin, Restrictions.Where(() => ejLevel1.Id == root.SameTypeChild.Id && root.Id != null))
162+
.JoinEntityAlias(() => ejLevel1, Restrictions.Where(() => ejLevel1.Id == root.SameTypeChild.Id && root.Id != null), JoinType.LeftOuterJoin)
163163
.JoinAlias(() => ejLevel1.Child1, () => customChildForEjLevel1, JoinType.InnerJoin)
164164
.JoinAlias(() => ejLevel1.SameTypeChild, () => entityComplexForEjLevel1, JoinType.LeftOuterJoin)
165-
.JoinEntityAlias(() => ejLevel2OnEntityComplexForEjLevel1, JoinType.InnerJoin, Restrictions.Where(() => entityComplexForEjLevel1.Id == ejLevel2OnEntityComplexForEjLevel1.Id))
165+
.JoinEntityAlias(() => ejLevel2OnEntityComplexForEjLevel1, Restrictions.Where(() => entityComplexForEjLevel1.Id == ejLevel2OnEntityComplexForEjLevel1.Id), JoinType.InnerJoin)
166166
.Where(() => customChildForEjLevel1.Id != null && ejLevel2OnEntityComplexForEjLevel1.Id != null)
167167
.Take(1)
168168
.SingleOrDefaultAsync<object>());
@@ -179,7 +179,7 @@ public async Task EntityJoinForCompositeKeyAsync()
179179
EntityWithNoAssociation root = null;
180180
root = await (session
181181
.QueryOver<EntityWithNoAssociation>(() => root)
182-
.JoinEntityAlias(() => ejComposite, JoinType.InnerJoin, Restrictions.Where(() => root.Composite1Key1 == ejComposite.Key.Id1 && root.Composite1Key2 == ejComposite.Key.Id2 ))
182+
.JoinEntityAlias(() => ejComposite, Restrictions.Where(() => root.Composite1Key1 == ejComposite.Key.Id1 && root.Composite1Key2 == ejComposite.Key.Id2), JoinType.InnerJoin)
183183
.Take(1).SingleOrDefaultAsync());
184184
var composite = await (session.LoadAsync<EntityWithCompositeId>(_entityWithCompositeId.Key));
185185

@@ -199,7 +199,7 @@ public async Task NullLeftEntityJoinAsync()
199199
EntityWithNoAssociation root = null;
200200
root = await (session.QueryOver<EntityWithNoAssociation>(() => root)
201201
//add some non existent
202-
.JoinEntityAlias(() => ejLeftNull, JoinType.LeftOuterJoin, Restrictions.Where(() => ejLeftNull.Id == null))
202+
.JoinEntityAlias(() => ejLeftNull, Restrictions.Where(() => ejLeftNull.Id == null), JoinType.LeftOuterJoin)
203203
.Take(1)
204204
.SingleOrDefaultAsync());
205205

@@ -219,7 +219,7 @@ public async Task NullLeftEntityJoinWithEntityProjectionAsync()
219219
EntityWithNoAssociation root = null;
220220
var objs = await (session.QueryOver<EntityWithNoAssociation>(() => root)
221221
//add some non existent
222-
.JoinEntityAlias(() => ejLeftNull, JoinType.LeftOuterJoin, Restrictions.Where(() => ejLeftNull.Id == null))
222+
.JoinEntityAlias(() => ejLeftNull, Restrictions.Where(() => ejLeftNull.Id == null), JoinType.LeftOuterJoin)
223223
.Select((e) => root.AsEntity(), e => ejLeftNull.AsEntity())
224224
.Take(1)
225225
.SingleOrDefaultAsync<object[]>());
@@ -243,7 +243,7 @@ public async Task EntityJoinForCustomEntityNameAsync()
243243
EntityCustomEntityName ejCustomEntity= null;
244244
EntityWithNoAssociation root = null;
245245
root = await (session.QueryOver<EntityWithNoAssociation>(() => root)
246-
.JoinEntityAlias(() => ejCustomEntity, JoinType.InnerJoin, Restrictions.Where(() => ejCustomEntity.Id == root.CustomEntityNameId), customEntityName)
246+
.JoinEntityAlias(() => ejCustomEntity, Restrictions.Where(() => ejCustomEntity.Id == root.CustomEntityNameId), JoinType.InnerJoin, customEntityName)
247247
.Take(1)
248248
.SingleOrDefaultAsync());
249249

‎src/NHibernate.Test/Criteria/EntityJoinCriteriaTest.cs‎

Lines changed: 85 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,26 @@ public void CanJoinNotAssociatedEntity()
2828
EntityComplex entityComplex = null;
2929
EntityWithNoAssociation root = null;
3030
root = session.QueryOver<EntityWithNoAssociation>(() => root)
31-
.JoinEntityAlias(() => entityComplex, JoinType.InnerJoin, Restrictions.Where(() => root.Complex1Id == entityComplex.Id)).Take(1)
31+
.JoinEntityAlias(() => entityComplex, Restrictions.Where(() => root.Complex1Id == entityComplex.Id), JoinType.InnerJoin).Take(1)
32+
.SingleOrDefault();
33+
entityComplex = session.Load<EntityComplex>(root.Complex1Id);
34+
35+
Assert.That(NHibernateUtil.IsInitialized(entityComplex), Is.True);
36+
Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
37+
}
38+
}
39+
40+
//check JoinEntityAlias - JoinAlias analog for entity join
41+
[Test]
42+
public void CanJoinNotAssociatedEntity_Expression()
43+
{
44+
using (var sqlLog = new SqlLogSpy())
45+
using (var session = OpenSession())
46+
{
47+
EntityComplex entityComplex = null;
48+
EntityWithNoAssociation root = null;
49+
root = session.QueryOver(() => root)
50+
.JoinEntityAlias(() => entityComplex, () => root.Complex1Id == entityComplex.Id).Take(1)
3251
.SingleOrDefault();
3352
entityComplex = session.Load<EntityComplex>(root.Complex1Id);
3453

@@ -47,7 +66,7 @@ public void CanJoinEntityQueryOver()
4766
EntityComplex ejQueryOver = null;
4867
EntityWithNoAssociation root = null;
4968
root = session.QueryOver<EntityWithNoAssociation>(() => root)
50-
.JoinEntityQueryOver( ()=> ejQueryOver, JoinType.InnerJoin, Restrictions.Where(() => root.Complex1Id == ejQueryOver.Id))
69+
.JoinEntityQueryOver(() => ejQueryOver, Restrictions.Where(() => root.Complex1Id == ejQueryOver.Id), JoinType.InnerJoin)
5170
.Take(1)
5271
.SingleOrDefault();
5372
ejQueryOver = session.Load<EntityComplex>(root.Complex1Id);
@@ -67,7 +86,7 @@ public void CanQueryOverForAssociationInNotAssociatedEntity()
6786
EntityComplex ejComplex = null;
6887
EntityWithNoAssociation root = null;
6988
root = session.QueryOver<EntityWithNoAssociation>(() => root)
70-
.JoinEntityQueryOver( ()=> ejComplex, JoinType.InnerJoin, Restrictions.Where(() => root.Complex1Id == ejComplex.Id))
89+
.JoinEntityQueryOver(() => ejComplex, Restrictions.Where(() => root.Complex1Id == ejComplex.Id), JoinType.InnerJoin)
7190
.JoinQueryOver(ej => ej.Child1)
7291
.Take(1)
7392
.SingleOrDefault();
@@ -90,7 +109,7 @@ public void SimpleProjectionForEntityJoin()
90109
EntityComplex ejComplex = null;
91110
EntityWithNoAssociation root = null;
92111
var name = session.QueryOver<EntityWithNoAssociation>(() => root)
93-
.JoinEntityQueryOver(() => ejComplex, JoinType.InnerJoin, Restrictions.Where(() => root.Complex1Id == ejComplex.Id))
112+
.JoinEntityQueryOver(() => ejComplex, Restrictions.Where(() => root.Complex1Id == ejComplex.Id), JoinType.InnerJoin)
94113
.Select((e) => ejComplex.Name)
95114
.Take(1)
96115
.SingleOrDefault<string>();
@@ -113,7 +132,7 @@ public void EntityProjectionForEntityJoin()
113132
var r = session
114133
.QueryOver<EntityComplex>(() => root)
115134
.JoinAlias(c => c.SameTypeChild, () => st)
116-
.JoinEntityAlias(() => ejChild1, JoinType.InnerJoin, Restrictions.Where(() => ejChild1.Id == root.Child1.Id))
135+
.JoinEntityAlias(() => ejChild1, Restrictions.Where(() => ejChild1.Id == root.Child1.Id), JoinType.InnerJoin)
117136
.Select(
118137
Projections.RootEntity(),
119138
Projections.Entity(() => st),
@@ -148,10 +167,10 @@ public void MixOfJoinsForAssociatedAndNotAssociatedEntities()
148167
EntitySimpleChild ejLevel2OnEntityComplexForEjLevel1 = null;
149168
var obj = session
150169
.QueryOver<EntityComplex>(() => root)
151-
.JoinEntityAlias(() => ejLevel1, JoinType.LeftOuterJoin, Restrictions.Where(() => ejLevel1.Id == root.SameTypeChild.Id && root.Id != null))
170+
.JoinEntityAlias(() => ejLevel1, Restrictions.Where(() => ejLevel1.Id == root.SameTypeChild.Id && root.Id != null), JoinType.LeftOuterJoin)
152171
.JoinAlias(() => ejLevel1.Child1, () => customChildForEjLevel1, JoinType.InnerJoin)
153172
.JoinAlias(() => ejLevel1.SameTypeChild, () => entityComplexForEjLevel1, JoinType.LeftOuterJoin)
154-
.JoinEntityAlias(() => ejLevel2OnEntityComplexForEjLevel1, JoinType.InnerJoin, Restrictions.Where(() => entityComplexForEjLevel1.Id == ejLevel2OnEntityComplexForEjLevel1.Id))
173+
.JoinEntityAlias(() => ejLevel2OnEntityComplexForEjLevel1, Restrictions.Where(() => entityComplexForEjLevel1.Id == ejLevel2OnEntityComplexForEjLevel1.Id), JoinType.InnerJoin)
155174
.Where(() => customChildForEjLevel1.Id != null && ejLevel2OnEntityComplexForEjLevel1.Id != null)
156175
.Take(1)
157176
.SingleOrDefault<object>();
@@ -168,7 +187,7 @@ public void EntityJoinForCompositeKey()
168187
EntityWithNoAssociation root = null;
169188
root = session
170189
.QueryOver<EntityWithNoAssociation>(() => root)
171-
.JoinEntityAlias(() => ejComposite, JoinType.InnerJoin, Restrictions.Where(() => root.Composite1Key1 == ejComposite.Key.Id1 && root.Composite1Key2 == ejComposite.Key.Id2 ))
190+
.JoinEntityAlias(() => ejComposite, Restrictions.Where(() => root.Composite1Key1 == ejComposite.Key.Id1 && root.Composite1Key2 == ejComposite.Key.Id2), JoinType.InnerJoin)
172191
.Take(1).SingleOrDefault();
173192
var composite = session.Load<EntityWithCompositeId>(_entityWithCompositeId.Key);
174193

@@ -188,7 +207,7 @@ public void NullLeftEntityJoin()
188207
EntityWithNoAssociation root = null;
189208
root = session.QueryOver<EntityWithNoAssociation>(() => root)
190209
//add some non existent
191-
.JoinEntityAlias(() => ejLeftNull, JoinType.LeftOuterJoin, Restrictions.Where(() => ejLeftNull.Id == null))
210+
.JoinEntityAlias(() => ejLeftNull, Restrictions.Where(() => ejLeftNull.Id == null), JoinType.LeftOuterJoin)
192211
.Take(1)
193212
.SingleOrDefault();
194213

@@ -208,7 +227,7 @@ public void NullLeftEntityJoinWithEntityProjection()
208227
EntityWithNoAssociation root = null;
209228
var objs = session.QueryOver<EntityWithNoAssociation>(() => root)
210229
//add some non existent
211-
.JoinEntityAlias(() => ejLeftNull, JoinType.LeftOuterJoin, Restrictions.Where(() => ejLeftNull.Id == null))
230+
.JoinEntityAlias(() => ejLeftNull, Restrictions.Where(() => ejLeftNull.Id == null), JoinType.LeftOuterJoin)
212231
.Select((e) => root.AsEntity(), e => ejLeftNull.AsEntity())
213232
.Take(1)
214233
.SingleOrDefault<object[]>();
@@ -232,7 +251,7 @@ public void EntityJoinForCustomEntityName()
232251
EntityCustomEntityName ejCustomEntity= null;
233252
EntityWithNoAssociation root = null;
234253
root = session.QueryOver<EntityWithNoAssociation>(() => root)
235-
.JoinEntityAlias(() => ejCustomEntity, JoinType.InnerJoin, Restrictions.Where(() => ejCustomEntity.Id == root.CustomEntityNameId), customEntityName)
254+
.JoinEntityAlias(() => ejCustomEntity, Restrictions.Where(() => ejCustomEntity.Id == root.CustomEntityNameId), JoinType.InnerJoin, customEntityName)
236255
.Take(1)
237256
.SingleOrDefault();
238257

@@ -243,6 +262,61 @@ public void EntityJoinForCustomEntityName()
243262
}
244263
}
245264

265+
[Test]
266+
public void EntityJoinFoSubquery_JoinEntityAlias()
267+
{
268+
using (var sqlLog = new SqlLogSpy())
269+
using (var session = OpenSession())
270+
{
271+
EntityComplex ej = null;
272+
EntityWithNoAssociation root = null;
273+
274+
EntityComplex ejSub = null;
275+
EntityWithNoAssociation rootSub = null;
276+
277+
var subquery = QueryOver.Of<EntityWithNoAssociation>(() => rootSub)
278+
.JoinEntityAlias(() => ejSub, () => rootSub.Complex1Id == ejSub.Id)
279+
.Where(r => ejSub.Name == ej.Name)
280+
.Select(x => ejSub.Id);
281+
282+
root = session.QueryOver(() => root)
283+
.JoinEntityAlias(() => ej, Restrictions.Where(() => root.Complex1Id == ej.Id))
284+
.WithSubquery.WhereExists(subquery)
285+
.SingleOrDefault();
286+
ej = session.Load<EntityComplex>(root.Complex1Id);
287+
288+
Assert.That(NHibernateUtil.IsInitialized(ej), Is.True);
289+
Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
290+
}
291+
}
292+
293+
[Test]
294+
public void EntityJoinFoSubquery_JoinQueryOver()
295+
{
296+
using (var sqlLog = new SqlLogSpy())
297+
using (var session = OpenSession())
298+
{
299+
EntityComplex ej = null;
300+
EntityWithNoAssociation root = null;
301+
302+
EntityComplex ejSub = null;
303+
EntityWithNoAssociation rootSub = null;
304+
305+
var subquery = QueryOver.Of<EntityWithNoAssociation>(() => rootSub)
306+
.JoinEntityQueryOver(() => ejSub, () => rootSub.Complex1Id == ejSub.Id)
307+
.Where(x => x.Name == ej.Name)
308+
.Select(x => ejSub.Id);
309+
310+
root = session.QueryOver(() => root)
311+
.JoinEntityAlias(() => ej, Restrictions.Where(() => root.Complex1Id == ej.Id))
312+
.WithSubquery.WhereExists(subquery)
313+
.SingleOrDefault();
314+
ej = session.Load<EntityComplex>(root.Complex1Id);
315+
316+
Assert.That(NHibernateUtil.IsInitialized(ej), Is.True);
317+
Assert.That(sqlLog.Appender.GetEvents().Length, Is.EqualTo(1), "Only one SQL select is expected");
318+
}
319+
}
246320
#region Test Setup
247321

248322
protected override HbmMapping GetMappings()

‎src/NHibernate/Criterion/ISupportEntityJoinQueryOver.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44

55
namespace NHibernate.Criterion
66
{
7-
//TODO: Make interface more flexible for changes (maybe it should take only 2 params alias + EntityJoinConfig)
7+
// 6.0 TODO: merge into IQueryOver.
88
public interface ISupportEntityJoinQueryOver
99
{
10-
void JoinEntityAlias<U>(Expression<Func<U>> alias, JoinType joinType, ICriterion withClause, string entityName);
10+
void JoinEntityAlias<U>(Expression<Func<U>> alias, ICriterion withClause, JoinType joinType, string entityName);
1111
}
12-
12+
13+
// 6.0 TODO: merge into IQueryOver<TRoot,TSubType>.
1314
public interface ISupportEntityJoinQueryOver<TRoot>: ISupportEntityJoinQueryOver
1415
{
15-
IQueryOver<TRoot, U> JoinEntityQueryOver<U>(Expression<Func<U>> alias, JoinType joinType, ICriterion withClause, string entityName);
16+
IQueryOver<TRoot, U> JoinEntityQueryOver<U>(Expression<Func<U>> alias, ICriterion withClause, JoinType joinType, string entityName);
1617
}
1718
}

‎src/NHibernate/Criterion/QueryOver.cs‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ internal static Exception GetDirectUsageException()
6565
[Serializable]
6666
public abstract partial class QueryOver<TRoot> : QueryOver, IQueryOver<TRoot>
6767
{
68-
protected internal QueryOver<TRoot, U> Create<U>(ICriteria criteria)
68+
protected internal QueryOver<TRoot, TSubType> Create<TSubType>(ICriteria criteria)
6969
{
70-
return new QueryOver<TRoot, U>(impl, criteria);
70+
return new QueryOver<TRoot, TSubType>(impl, criteria);
7171
}
7272

7373
private IList<TRoot> List()
@@ -663,7 +663,12 @@ public QueryOver<TRoot,U> JoinQueryOver<U>(Expression<Func<IEnumerable<U>>> path
663663
joinType));
664664
}
665665

666-
public QueryOver<TRoot,U> JoinEntityQueryOver<U>(Expression<Func<U>> alias, JoinType joinType, ICriterion withClause, string entityName)
666+
public QueryOver<TRoot, U> JoinEntityQueryOver<U>(Expression<Func<U>> alias, Expression<Func<bool>> withClause, JoinType joinType = JoinType.InnerJoin, string entityName = null)
667+
{
668+
return JoinEntityQueryOver(alias, Restrictions.Where(withClause), joinType, entityName);
669+
}
670+
671+
public QueryOver<TRoot, U> JoinEntityQueryOver<U>(Expression<Func<U>> alias, ICriterion withClause, JoinType joinType = JoinType.InnerJoin, string entityName = null)
667672
{
668673
return Create<U>(CreateEntityCriteria(alias, joinType, withClause, entityName));
669674
}
@@ -770,7 +775,7 @@ private QueryOver<TRoot,TSubType> AddAlias(string path, string alias, JoinType j
770775

771776
private ICriteria CreateEntityCriteria<U>(Expression<Func<U>> alias, JoinType joinType, ICriterion withClause, string entityName)
772777
{
773-
return criteria.CreateEntityCriteria(ExpressionProcessor.FindMemberExpression(alias.Body), joinType, withClause, entityName ?? typeof(U).FullName);
778+
return criteria.CreateEntityCriteria(ExpressionProcessor.FindMemberExpression(alias.Body), withClause, joinType, entityName ?? typeof(U).FullName);
774779
}
775780

776781
private QueryOver<TRoot,TSubType> Add(Expression<Func<TSubType, bool>> expression)
@@ -989,13 +994,12 @@ IQueryOver<TRoot,TSubType> IQueryOver<TRoot,TSubType>.JoinAlias<U>(Expression<Fu
989994
IQueryOver<TRoot,TSubType> IQueryOver<TRoot,TSubType>.JoinAlias<U>(Expression<Func<IEnumerable<U>>> path, Expression<Func<U>> alias, JoinType joinType, ICriterion withClause)
990995
{ return JoinAlias(path, alias, joinType, withClause); }
991996

992-
IQueryOver<TRoot, U> ISupportEntityJoinQueryOver<TRoot>.JoinEntityQueryOver<U>(Expression<Func<U>> alias, JoinType joinType, ICriterion withClause, string entityName)
997+
IQueryOver<TRoot, U> ISupportEntityJoinQueryOver<TRoot>.JoinEntityQueryOver<U>(Expression<Func<U>> alias, ICriterion withClause, JoinType joinType, string entityName)
993998
{
994-
return JoinEntityQueryOver(alias, joinType, withClause, entityName);
999+
return JoinEntityQueryOver(alias, withClause, joinType, entityName);
9951000
}
9961001

997-
//6.0 TODO: to remove and merge with extension EntityJoinExtensions.JoinEntityAlias
998-
void ISupportEntityJoinQueryOver.JoinEntityAlias<U>(Expression<Func<U>> alias, JoinType joinType, ICriterion withClause, string entityName)
1002+
void ISupportEntityJoinQueryOver.JoinEntityAlias<U>(Expression<Func<U>> alias, ICriterion withClause, JoinType joinType, string entityName)
9991003
{
10001004
CreateEntityCriteria(alias, joinType, withClause, entityName);
10011005
}

0 commit comments

Comments
 (0)