Skip to content

Commit b724a06

Browse files
committed
HHH-19559 use IdentifierHelper to handle casing of schema name is setSchema()
1 parent 7d9ec98 commit b724a06

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@
117117
import java.util.function.Function;
118118

119119
import static java.lang.Boolean.TRUE;
120+
import static org.hibernate.boot.model.naming.Identifier.toIdentifier;
120121
import static org.hibernate.internal.util.StringHelper.isEmpty;
121122
import static org.hibernate.query.sqm.internal.SqmUtil.verifyIsSelectStatement;
122123

@@ -712,8 +713,13 @@ private boolean useSchemaBasedMultiTenancy() {
712713
}
713714

714715
private String tenantSchema() {
715-
final var tenantSchemaMapper = factory.getSessionFactoryOptions().getTenantSchemaMapper();
716-
return tenantSchemaMapper == null ? null : tenantSchemaMapper.schemaName( tenantIdentifier );
716+
final var mapper = factory.getSessionFactoryOptions().getTenantSchemaMapper();
717+
return mapper == null ? null : normalizeSchemaName( mapper.schemaName( tenantIdentifier ) );
718+
}
719+
720+
private String normalizeSchemaName(String schemaName) {
721+
return jdbcServices.getJdbcEnvironment().getIdentifierHelper()
722+
.toMetaDataSchemaName( toIdentifier( schemaName ) );
717723
}
718724

719725
private transient String initialSchema;

0 commit comments

Comments
 (0)