Skip to content

Commit 8030961

Browse files
Make obsolete abstract virtual
1 parent 1997661 commit 8030961

File tree

3 files changed

+13
-19
lines changed

3 files changed

+13
-19
lines changed

src/NHibernate/Persister/Collection/AbstractCollectionPersister.cs

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,15 +1649,24 @@ public object NotFoundObject
16491649
// 6.0 TODO: Remove (Replace with ISupportSelectModeJoinable.SelectFragment)
16501650
// Since v5.2
16511651
[Obsolete("Use overload taking includeLazyProperties parameter")]
1652-
public abstract string SelectFragment(IJoinable rhs, string rhsAlias, string lhsAlias, string currentEntitySuffix,
1653-
string currentCollectionSuffix, bool includeCollectionColumns);
1654-
1652+
public virtual string SelectFragment(
1653+
IJoinable rhs,
1654+
string rhsAlias,
1655+
string lhsAlias,
1656+
string currentEntitySuffix,
1657+
string currentCollectionSuffix,
1658+
bool includeCollectionColumns)
1659+
{
1660+
return SelectFragment(
1661+
rhs, rhsAlias, lhsAlias, currentEntitySuffix, currentCollectionSuffix, includeCollectionColumns, false);
1662+
}
1663+
16551664
// 6.0 TODO: Make abstract
16561665
public virtual string SelectFragment(
16571666
IJoinable rhs, string rhsAlias, string lhsAlias, string entitySuffix, string collectionSuffix,
16581667
bool includeCollectionColumns, bool includeLazyProperties)
16591668
{
1660-
throw new NotImplementedException("Fetching lazy properties is not implemented by " + GetType().FullName);
1669+
throw new NotImplementedException("SelectFragment with fetching lazy properties option is not implemented by " + GetType().FullName);
16611670
}
16621671

16631672
/// <summary>

src/NHibernate/Persister/Collection/BasicCollectionPersister.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -263,14 +263,6 @@ public override string SelectFragment(IJoinable rhs, string rhsAlias, string lhs
263263
return includeCollectionColumns ? SelectFragment(lhsAlias, collectionSuffix) : string.Empty;
264264
}
265265

266-
// Since v5.2
267-
[Obsolete("Use overload taking includeLazyProperties parameter")]
268-
public override string SelectFragment(IJoinable rhs, string rhsAlias, string lhsAlias,
269-
string entitySuffix, string collectionSuffix, bool includeCollectionColumns)
270-
{
271-
return SelectFragment(rhs, rhsAlias, lhsAlias, entitySuffix, collectionSuffix, includeCollectionColumns, false);
272-
}
273-
274266
private string ManyToManySelectFragment(IJoinable rhs, string rhsAlias, string lhsAlias, string collectionSuffix)
275267
{
276268
SelectFragment frag = GenerateSelectFragment(lhsAlias, collectionSuffix);

src/NHibernate/Persister/Collection/OneToManyPersister.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -303,13 +303,6 @@ protected override int DoUpdateRows(object id, IPersistentCollection collection,
303303
}
304304
}
305305

306-
// Since v5.2
307-
[Obsolete("Use overload taking includeLazyProperties parameter")]
308-
public override string SelectFragment(IJoinable rhs, string rhsAlias, string lhsAlias, string entitySuffix, string collectionSuffix, bool includeCollectionColumns)
309-
{
310-
return SelectFragment(rhs, rhsAlias, lhsAlias, entitySuffix, collectionSuffix, includeCollectionColumns, false);
311-
}
312-
313306
public override string SelectFragment(IJoinable rhs, string rhsAlias, string lhsAlias, string entitySuffix, string collectionSuffix, bool includeCollectionColumns, bool fetchLazyProperties)
314307
{
315308
var buf = new StringBuilder();

0 commit comments

Comments
 (0)