Skip to content

Commit e4c620e

Browse files
author
g.yakimov
committed
add missing implementations
1 parent 5a6dc6a commit e4c620e

File tree

5 files changed

+30
-2
lines changed

5 files changed

+30
-2
lines changed

src/NHibernate/Hql/Ast/ANTLR/Tree/ComponentJoin.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,11 @@ public bool TryToType(string propertyName, out IType type)
150150
return fromElementType.GetBasePropertyMapping().TryToType(GetPropertyPath(propertyName), out type);
151151
}
152152

153+
public string[] ToColumns(ICriteria pathCriteria, string propertyName, Func<ICriteria, string> getSQLAlias)
154+
{
155+
return fromElementType.GetBasePropertyMapping().ToColumns(pathCriteria, GetPropertyPath(propertyName), getSQLAlias);
156+
}
157+
153158
public string[] ToColumns(string alias, string propertyName)
154159
{
155160
return fromElementType.GetBasePropertyMapping().ToColumns(alias, GetPropertyPath(propertyName));

src/NHibernate/Persister/Collection/AbstractCollectionPersister.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,6 +1386,12 @@ public bool IsManyToManyFiltered(IDictionary<string, IFilter> enabledFilters)
13861386
return IsManyToMany && (manyToManyWhereString != null || manyToManyFilterHelper.IsAffectedBy(enabledFilters));
13871387
}
13881388

1389+
public string[] ToColumns(ICriteria pathCriteria, string propertyName, Func<ICriteria, string> getSQLAlias)
1390+
{
1391+
string alias = getSQLAlias(pathCriteria);
1392+
return ToColumns(alias, propertyName);
1393+
}
1394+
13891395
public string[] ToColumns(string alias, string propertyName)
13901396
{
13911397
if ("index".Equals(propertyName))

src/NHibernate/Persister/Collection/CollectionPropertyMapping.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ public bool TryToType(string propertyName, out IType type)
5757
}
5858
}
5959

60+
public string[] ToColumns(ICriteria pathCriteria, string propertyName, Func<ICriteria, string> getSQLAlias)
61+
{
62+
string alias = getSQLAlias(pathCriteria);
63+
return ToColumns(alias, propertyName);
64+
}
65+
6066
public string[] ToColumns(string alias, string propertyName)
6167
{
6268
string[] cols;
@@ -117,4 +123,4 @@ public IType Type
117123
get { return memberPersister.CollectionType; }
118124
}
119125
}
120-
}
126+
}

src/NHibernate/Persister/Collection/ElementPropertyMapping.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ public bool TryToType(string propertyName, out IType outType)
4747
}
4848
}
4949

50+
public string[] ToColumns(ICriteria pathCriteria, string propertyName, Func<ICriteria, string> getSQLAlias)
51+
{
52+
string alias = getSQLAlias(pathCriteria);
53+
return ToColumns(alias, propertyName);
54+
}
55+
5056
public string[] ToColumns(string alias, string propertyName)
5157
{
5258
if (propertyName == null || "id".Equals(propertyName))
@@ -71,4 +77,4 @@ public IType Type
7177

7278
#endregion
7379
}
74-
}
80+
}

src/NHibernate/Persister/Entity/AbstractEntityPersister.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2050,6 +2050,11 @@ public virtual string GetRootTableAlias(string drivingAlias)
20502050
return drivingAlias;
20512051
}
20522052

2053+
public virtual string[] ToColumns(ICriteria pathCriteria, string propertyName, Func<ICriteria, string> getSQLAlias)
2054+
{
2055+
return propertyMapping.ToColumns(pathCriteria, propertyName, getSQLAlias);
2056+
}
2057+
20532058
public virtual string[] ToColumns(string alias, string propertyName)
20542059
{
20552060
return propertyMapping.ToColumns(alias, propertyName);

0 commit comments

Comments
 (0)