Skip to content

Commit 8d88fa2

Browse files
committed
Renamed JoinEntityAlias -> CreateEntityAlias to avoid collision with extension after interface is merged with IQueryOver
1 parent 5e089e6 commit 8d88fa2

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/NHibernate/Criterion/ISupportEntityJoinQueryOver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace NHibernate.Criterion
77
// 6.0 TODO: merge into IQueryOver.
88
public interface ISupportEntityJoinQueryOver
99
{
10-
void JoinEntityAlias<U>(Expression<Func<U>> alias, ICriterion withClause, JoinType joinType, string entityName);
10+
void CreateEntityAlias<U>(Expression<Func<U>> alias, ICriterion withClause, JoinType joinType, string entityName);
1111
}
1212

1313
// 6.0 TODO: merge into IQueryOver<TRoot,TSubType>.

src/NHibernate/Criterion/QueryOver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -999,7 +999,7 @@ IQueryOver<TRoot, U> ISupportEntityJoinQueryOver<TRoot>.JoinEntityQueryOver<U>(E
999999
return JoinEntityQueryOver(alias, withClause, joinType, entityName);
10001000
}
10011001

1002-
void ISupportEntityJoinQueryOver.JoinEntityAlias<U>(Expression<Func<U>> alias, ICriterion withClause, JoinType joinType, string entityName)
1002+
void ISupportEntityJoinQueryOver.CreateEntityAlias<U>(Expression<Func<U>> alias, ICriterion withClause, JoinType joinType, string entityName)
10031003
{
10041004
CreateEntityCriteria(alias, joinType, withClause, entityName);
10051005
}

src/NHibernate/EntityJoinExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public static class EntityJoinExtensions
1111
public static TThis JoinEntityAlias<TThis, TEntity>(this TThis queryOver, Expression<Func<TEntity>> alias, ICriterion withClause, JoinType joinType = JoinType.InnerJoin, string entityName = null) where TThis : IQueryOver
1212
{
1313
var q = CastOrThrow<ISupportEntityJoinQueryOver>(queryOver);
14-
q.JoinEntityAlias(alias, withClause, joinType, entityName);
14+
q.CreateEntityAlias(alias, withClause, joinType, entityName);
1515
return queryOver;
1616
}
1717

0 commit comments

Comments
 (0)