Skip to content

Commit 3fa9663

Browse files
fixup! Support multiple properties in select id generator
1 parent 9260165 commit 3fa9663

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

src/NHibernate/Async/Persister/Collection/AbstractCollectionPersister.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace NHibernate.Persister.Collection
3939
using System.Threading.Tasks;
4040
using System.Threading;
4141
public abstract partial class AbstractCollectionPersister : ICollectionMetadata, ISqlLoadableCollection,
42-
IPostInsertIdentityPersister, ISupportSelectModeJoinable, IMultiPropertiesPostInsertIdentityPersister
42+
IPostInsertIdentityPersister, ISupportSelectModeJoinable, ICompositeKeyPostInsertIdentityPersister
4343
{
4444

4545
public Task InitializeAsync(object key, ISessionImplementor session, CancellationToken cancellationToken)

src/NHibernate/Async/Persister/Entity/AbstractEntityPersister.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ namespace NHibernate.Persister.Entity
4545
using System.Threading;
4646
public abstract partial class AbstractEntityPersister : IOuterJoinLoadable, IQueryable, IClassMetadata,
4747
IUniqueKeyLoadable, ISqlLoadable, ILazyPropertyInitializer, IPostInsertIdentityPersister, ILockable,
48-
ISupportSelectModeJoinable, IMultiPropertiesPostInsertIdentityPersister
48+
ISupportSelectModeJoinable, ICompositeKeyPostInsertIdentityPersister
4949
{
5050

5151
private partial class GeneratedIdentifierBinder : IBinder

src/NHibernate/Id/IPostInsertIdentityPersister.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ public static SqlString GetSelectByUniqueKeyString(
1111
this IPostInsertIdentityPersister persister,
1212
string[] propertyNames)
1313
{
14-
if (persister is IMultiPropertiesPostInsertIdentityPersister multiProperties)
14+
if (persister is ICompositeKeyPostInsertIdentityPersister multiProperties)
1515
return multiProperties.GetSelectByUniqueKeyString(propertyNames);
1616

1717
if (propertyNames.Length > 1)
1818
{
1919
throw new IdentifierGenerationException(
20-
$"persister {persister} does not implement {nameof(IMultiPropertiesPostInsertIdentityPersister)}, " +
20+
$"persister {persister} does not implement {nameof(ICompositeKeyPostInsertIdentityPersister)}, " +
2121
$"which is required for selecting by an unique key spanning multiple properties.");
2222
}
2323

@@ -74,7 +74,7 @@ public interface IPostInsertIdentityPersister
7474
/// An <see cref="IPostInsertIdentityPersister" /> that supports selecting by an unique key spanning
7575
/// multiple properties.
7676
/// </summary>
77-
public interface IMultiPropertiesPostInsertIdentityPersister
77+
public interface ICompositeKeyPostInsertIdentityPersister
7878
{
7979
/// <summary>
8080
/// Get a SQL select string that performs a select based on a unique

src/NHibernate/Persister/Collection/AbstractCollectionPersister.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace NHibernate.Persister.Collection
3030
/// Summary description for AbstractCollectionPersister.
3131
/// </summary>
3232
public abstract partial class AbstractCollectionPersister : ICollectionMetadata, ISqlLoadableCollection,
33-
IPostInsertIdentityPersister, ISupportSelectModeJoinable, IMultiPropertiesPostInsertIdentityPersister
33+
IPostInsertIdentityPersister, ISupportSelectModeJoinable, ICompositeKeyPostInsertIdentityPersister
3434
{
3535
protected static readonly object NotFoundPlaceHolder = new object();
3636
private readonly string role;

src/NHibernate/Persister/Entity/AbstractEntityPersister.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ namespace NHibernate.Persister.Entity
4040
/// </remarks>
4141
public abstract partial class AbstractEntityPersister : IOuterJoinLoadable, IQueryable, IClassMetadata,
4242
IUniqueKeyLoadable, ISqlLoadable, ILazyPropertyInitializer, IPostInsertIdentityPersister, ILockable,
43-
ISupportSelectModeJoinable, IMultiPropertiesPostInsertIdentityPersister
43+
ISupportSelectModeJoinable, ICompositeKeyPostInsertIdentityPersister
4444
{
4545
#region InclusionChecker
4646

0 commit comments

Comments
 (0)