HHH-6328 Test and fix SecondaryRow/Table name matching with respect to physical name strategies

Author: beikov

hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java

@@ -2045,15 +2045,15 @@ private SecondaryTable findMatchingSecondaryTable(Join join) {
 
 	private SecondaryRow findMatchingSecondaryRowAnnotation(String tableName) {
 		final SecondaryRow row = annotatedClass.getDirectAnnotationUsage( SecondaryRow.class );
-		if ( row != null && ( row.table().isBlank() || tableName.equals( row.table() ) ) ) {
+		if ( row != null && ( row.table().isBlank() || equalsTableName( tableName, row ) ) ) {
 			return row;
 		}
 		else {
 			final SecondaryRows tables = annotatedClass.getDirectAnnotationUsage( SecondaryRows.class );
 			if ( tables != null ) {
 				final SecondaryRow[] rowList = tables.value();
 				for ( SecondaryRow current : rowList ) {
-					if ( tableName.equals( current.table() ) ) {
+					if ( equalsTableName( tableName, current ) ) {
 						return current;
 					}
 				}
@@ -2062,6 +2062,13 @@ private SecondaryRow findMatchingSecondaryRowAnnotation(String tableName) {
 		}
 	}
 
+	private boolean equalsTableName(String physicalTableName, SecondaryRow secondaryRow) {
+		final Identifier logicalName = context.getMetadataCollector().getDatabase().toIdentifier( secondaryRow.table() );
+		final Identifier secondaryRowPhysicalTableName = context.getBuildingOptions().getPhysicalNamingStrategy()
+				.toPhysicalTableName( logicalName, EntityTableNamingStrategyHelper.jdbcEnvironment( context ) );
+		return physicalTableName.equals( secondaryRowPhysicalTableName.render() );
+	}
+
 	//Used for @*ToMany @JoinTable
 	public Join addJoinTable(JoinTable joinTable, PropertyHolder holder, boolean noDelayInPkColumnCreation) {
 		final Join join = addJoin(

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableQuotingTest.java

@@ -0,0 +1,65 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.annotations.secondarytable;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.PrimaryKeyJoinColumn;
+import jakarta.persistence.SecondaryTable;
+import org.hibernate.annotations.SecondaryRow;
+import org.hibernate.boot.model.naming.Identifier;
+import org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.persister.entity.mutation.EntityTableMapping;
+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.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+@ServiceRegistry(
+		settings = {
+				@Setting(name = AvailableSettings.PHYSICAL_NAMING_STRATEGY, value = "org.hibernate.orm.test.annotations.secondarytable.SecondaryTableQuotingTest$TestNamingStrategy")
+		}
+)
+@DomainModel(annotatedClasses = SecondaryTableQuotingTest.Foo.class)
+@SessionFactory
+@JiraKey(value = "HHH-6328")
+public class SecondaryTableQuotingTest {
+
+	@Test
+	public void test(SessionFactoryScope scope) {
+		final EntityPersister entityDescriptor = scope.getSessionFactory().getRuntimeMetamodels().getMappingMetamodel()
+				.getEntityDescriptor( Foo.class );
+		final EntityTableMapping secondaryTableMapping = entityDescriptor.getTableMappings()[1];
+		assertFalse( secondaryTableMapping.isOptional() );
+	}
+
+	@Entity(name = "Foo")
+	@SecondaryTable(name = "bar", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "foo_id")})
+	@SecondaryRow(table = "bar", optional = false)
+	public static class Foo {
+		@Id
+		private Long id;
+		private String name;
+		@Column(name = "bar_value", table = "bar")
+		private Long barValue;
+
+	}
+
+	public static class TestNamingStrategy extends PhysicalNamingStrategyStandardImpl {
+		@Override
+		public Identifier toPhysicalTableName(Identifier logicalName, JdbcEnvironment jdbcEnvironment) {
+			return Identifier.toIdentifier( "TAB_" + logicalName.getText() );
+		}
+	}
+}