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

HHH-17972 - Allow changing tenant identifier in SharedSessionBuilder 

Signed-off-by: Jan Schatteman <jschatte@redhat.com>
This commit is contained in:
Jan Schatteman 2024-05-09 22:31:15 +02:00 committed by Christian Beikov
parent 11d22531bb
commit 02f085e153
3 changed files with 65 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java
View File

@ -362,7 +362,7 @@ public interface SessionFactoryBuilder {
/**
* Specifies whether multi-tenancy is enabled
*
* @param enabled True if multi-tenancy in use.
* @param enabled True if multi-tenancy in use through a {@link org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider}.
*
* @return {@code this}, for method chaining
*/

14
hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
View File

@ -2063,14 +2063,20 @@ public class SessionImpl
@Override @Deprecated
public SharedSessionBuilderImpl tenantIdentifier(String tenantIdentifier) {
// todo : is this always true? Or just in the case of sharing JDBC resources?
throw new SessionException( "Cannot redefine tenant identifier on child session" );
if ( !session.getSessionFactory().getSessionFactoryOptions().isMultiTenancyEnabled() ) {
throw new SessionException( "Cannot redefine tenant identifier on child session" );
}
super.tenantIdentifier( tenantIdentifier );
return this;
}
@Override
public SharedSessionBuilderImpl tenantIdentifier(Object tenantIdentifier) {
// todo : is this always true? Or just in the case of sharing JDBC resources?
throw new SessionException( "Cannot redefine tenant identifier on child session" );
if ( session.getSessionFactory().getSessionFactoryOptions().isMultiTenancyEnabled() ) {
throw new SessionException( "Cannot redefine tenant identifier on child session" );
}
super.tenantIdentifier( tenantIdentifier );
return this;
}
@Override

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

@ -8,19 +8,23 @@ package org.hibernate.orm.test.tenantid;
import org.hibernate.HibernateError;
import org.hibernate.PropertyValueException;
import org.hibernate.Session;
import org.hibernate.StatelessSession;
import org.hibernate.Transaction;
import org.hibernate.boot.SessionFactoryBuilder;
import org.hibernate.boot.spi.MetadataImplementor;
import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
import org.hibernate.dialect.SybaseASEDialect;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.JiraKey;
import org.hibernate.testing.orm.junit.ServiceRegistry;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryProducer;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.hibernate.testing.orm.junit.Setting;
import org.hibernate.binder.internal.TenantIdBinder;
import org.hibernate.query.Query;
import org.hibernate.query.criteria.HibernateCriteriaBuilder;
import org.hibernate.query.criteria.JpaCriteriaQuery;
import org.hibernate.query.criteria.JpaRoot;
@ -57,11 +61,15 @@ public class TenantIdTest implements SessionFactoryProducer {
@AfterEach
public void cleanup(SessionFactoryScope scope) {
scope.inTransaction( session -> {
session.createQuery("delete from Account").executeUpdate();
session.createQuery("delete from Client").executeUpdate();
session.createQuery("delete from Record").executeUpdate();
});
// Use the root tenant to clean up all partitions
currentTenant = "root";
scope.inTransaction(
session -> {
session.createMutationQuery( "delete from Account" ).executeUpdate();
session.createMutationQuery( "delete from Client" ).executeUpdate();
session.createMutationQuery( "delete from Record" ).executeUpdate();
}
);
}
@Override
@ -96,17 +104,17 @@ public class TenantIdTest implements SessionFactoryProducer {
} );
scope.inTransaction( session -> {
assertNotNull( session.find(Account.class, acc.id) );
assertEquals( 1, session.createQuery("from Account").getResultList().size() );
assertEquals( 1, session.createQuery("from Account", Account.class).getResultList().size() );
} );
assertEquals("mine", acc.tenantId);
currentTenant = "yours";
scope.inTransaction( session -> {
assertNotNull( session.find(Account.class, acc.id) );
assertEquals( 0, session.createQuery("from Account").getResultList().size() );
assertEquals( 0, session.createQuery("from Account", Account.class).getResultList().size() );
session.disableFilter(TenantIdBinder.FILTER_NAME);
assertNotNull( session.find(Account.class, acc.id) );
assertEquals( 1, session.createQuery("from Account").getResultList().size() );
assertEquals( 1, session.createQuery("from Account", Account.class).getResultList().size() );
} );
}
@ -114,7 +122,7 @@ public class TenantIdTest implements SessionFactoryProducer {
public void testRoot(SessionFactoryScope scope) {
currentTenant = "root";
scope.inTransaction( session -> {
assertEquals( 0, session.createQuery( "from Account" ).getResultList().size() );
assertEquals( 0, session.createQuery( "from Account", Account.class ).getResultList().size() );
} );
currentTenant = "mine";
@ -127,14 +135,14 @@ public class TenantIdTest implements SessionFactoryProducer {
assertEquals( "mine", acc.tenantId );
scope.inTransaction( session -> {
assertNotNull( session.find( Account.class, acc.id ) );
assertEquals( 1, session.createQuery( "from Account" ).getResultList().size() );
assertEquals( 1, session.createQuery( "from Account", Account.class ).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() );
assertEquals( 1, session.createQuery( "from Account", Account.class ).getResultList().size() );
} );
// Root tenants should find entities from their own tenant
@ -147,7 +155,7 @@ public class TenantIdTest implements SessionFactoryProducer {
assertEquals( "root", rootAcc.tenantId );
scope.inTransaction( session -> {
assertNotNull( session.find( Account.class, rootAcc.id ) );
assertEquals( 2, session.createQuery( "from Account" ).getResultList().size() );
assertEquals( 2, session.createQuery( "from Account", Account.class ).getResultList().size() );
} );
}
@ -292,6 +300,40 @@ public class TenantIdTest implements SessionFactoryProducer {
} );
}
@Test
@JiraKey( value = "HHH-17972")
public void testChangeTenantId(SessionFactoryScope scope) {
currentTenant = "mine";
scope.inSession(
session -> {
Query<Client> sessionQuery = session.createQuery( "from Client", Client.class );
Transaction t = session.beginTransaction();
session.persist( new Client("Gavin") );
t.commit();
assertEquals(1, sessionQuery.getResultList().size() );
assertEquals( "mine", sessionQuery.getResultList().get( 0 ).tenantId );
Session newSession = session.sessionWithOptions().tenantIdentifier( "yours" ).connection().openSession();
Query<Client> newSessionQuery = newSession.createQuery( "from Client", Client.class );
t = newSession.beginTransaction();
newSession.persist( new Client("Jan") );
t.commit();
assertEquals(1, newSessionQuery.getResultList().size() );
assertEquals( "yours", newSessionQuery.getResultList().get( 0 ).tenantId );
session.disableFilter( TenantIdBinder.FILTER_NAME );
assertEquals(2, sessionQuery.getResultList().size() );
newSession.disableFilter( TenantIdBinder.FILTER_NAME );
assertEquals(2, newSessionQuery.getResultList().size() );
newSession.close();
}
);
}
private static List<Record> listAllRecordsForTenant(StatelessSession session) {
HibernateCriteriaBuilder criteriaBuilder = session.getCriteriaBuilder();
JpaCriteriaQuery<Record> criteriaQuery = criteriaBuilder.createQuery( Record.class );