Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-17935 Do not use the "auto-enable" feature for the tenant ID filter 

This filter already gets enabled automatically where relevant, and
critically it's not relevant when using a "root" tenant identifier.
This commit is contained in:
Yoann Rodière 2024-04-10 13:44:44 +02:00 committed by Christian Beikov
parent ce97a5da2c
commit 56105a8fc6
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/binder/internal/TenantIdBinder.java
View File

@ -59,7 +59,7 @@ public class TenantIdBinder implements AttributeBinder<TenantId> {
"",
singletonMap( PARAMETER_NAME, tenantIdType ),
Collections.emptyMap(),
true
false
)
);
}

46
hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/TenantIdTest.java
View File

@ -76,6 +76,11 @@ public class TenantIdTest implements SessionFactoryProducer {
public boolean validateExistingCurrentSessions() {
return false;
}
@Override
public boolean isRoot(String tenantId) {
return "root".equals( tenantId );
}
} );
return (SessionFactoryImplementor) sessionFactoryBuilder.build();
}
@ -105,6 +110,47 @@ public class TenantIdTest implements SessionFactoryProducer {
} );
}
@Test
public void testRoot(SessionFactoryScope scope) {
currentTenant = "root";
scope.inTransaction( session -> {
assertEquals( 0, session.createQuery( "from Account" ).getResultList().size() );
} );
currentTenant = "mine";
Client client = new Client( "Gavin" );
Account acc = new Account( client );
scope.inTransaction( session -> {
session.persist( client );
session.persist( acc );
} );
assertEquals( "mine", acc.tenantId );
scope.inTransaction( session -> {
assertNotNull( session.find( Account.class, acc.id ) );
assertEquals( 1, session.createQuery( "from Account" ).getResultList().size() );
} );
currentTenant = "root";
// Root tenants should find entities from other tenants
scope.inTransaction( session -> {
assertNotNull( session.find( Account.class, acc.id ) );
assertEquals( 1, session.createQuery( "from Account" ).getResultList().size() );
} );
// Root tenants should find entities from their own tenant
Client rootClient = new Client( "Sacha" );
Account rootAcc = new Account( rootClient );
scope.inTransaction( session -> {
session.persist( rootClient );
session.persist( rootAcc );
} );
assertEquals( "root", rootAcc.tenantId );
scope.inTransaction( session -> {
assertNotNull( session.find( Account.class, rootAcc.id ) );
assertEquals( 2, session.createQuery( "from Account" ).getResultList().size() );
} );
}
@Test
public void testErrorOnInsert(SessionFactoryScope scope) {
currentTenant = "mine";