HHH-12678 Fix checkColumnDuplication failure for columns with same name from distinct tables #11512

MohammedAymanKhan · 2025-12-28T10:47:09Z

Issue

Hibernate incorrectly reports duplicate column mappings when the same column name (e.g. address) is used in different secondary tables of the same entity. This occurs because checkColumnDuplication() only considers the column name and ignores the table name.

Jira: https://hibernate.atlassian.net/browse/HHH-12678

Changes

Modified the column duplication check to qualify column names with their table name (tableName.columnName) when building the uniqueness set.
This ensures that columns with the same name in distinct tables are no longer treated as duplicates.
The change preserves existing behavior for columns within the same table while correctly allowing valid cross-table column name reuse.

Test

Added regression test TablePerClassColumnDuplicationCheckTest that reproduces the original failure and now passes with the fix.
Credit for the original test case goes to Christian Beikov (from HHH-12678 Add test for table per class column override #11502).

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.

…me from distinct tables

hibernate-github-bot · 2025-12-28T10:47:16Z

Thanks for your pull request!

This pull request appears to follow the contribution rules.

› This message was automatically generated.

gavinking · 2025-12-28T11:11:05Z

.idea/codeStyles/codeStyleConfig.xml

 <component name="ProjectCodeStyleConfiguration">
  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="hibernate-style" />


Please back out this change.

Done. I have removed the IDE configuration file from the PR.

gavinking

Thanks. I left a minor suggestion.

gavinking · 2025-12-28T11:13:01Z

hibernate-core/src/main/java/org/hibernate/mapping/Value.java

+				String tableName = ( getTable() != null ) ? getTable().getName() : "";
+				String uniqueKey = tableName.isEmpty() ? col.getName() : tableName + "." + col.getName();


Suggested change

String tableName = ( getTable() != null ) ? getTable().getName() : "";

String uniqueKey = tableName.isEmpty() ? col.getName() : tableName + "." + col.getName();

final var primaryTable = getTable();

final String tableName = primaryTable != null ? primaryTable.getName() : "";

final String uniqueKey = tableName.isEmpty() ? col.getName() : tableName + "." + col.getName();

Applied. Thanks for the suggestion!

…lication check

MohammedAymanKhan · 2025-12-28T15:02:22Z

Hi @gavinking and Team,
Thanks again for the review and feedback!

The OpenJDK 25 jobs (hsqldb, h2, mysql, postgresql, etc.) are currently failing with "There were failing tests" in :hibernate-core:test

I’ve seen similar test failures on JDK 25 in other recent PRs as well. Since my change is quite small, I’m wondering

Are these JDK 25 test failures related to my code changes, or is this a known/project-wide issue with JDK 25 compatibility?

I’m happy to investigate locally if needed, but wanted to check first since my change is minimal.

Thanks!

gavinking · 2025-12-29T09:49:58Z

@MohammedAymanKhan The error is:

        Caused by:
        java.lang.NullPointerException: Cannot invoke "String.isEmpty()" because "tableName" is null
            at org.hibernate.mapping.Value.checkColumnDuplication(Value.java:199)
            at org.hibernate.mapping.Collection.checkColumnDuplication(Collection.java:400)
            at org.hibernate.mapping.Collection.validate(Collection.java:394)
            at org.hibernate.mapping.Set.validate(Set.java:51)
            at org.hibernate.boot.internal.MetadataImpl.validate(MetadataImpl.java:468)
            at org.hibernate.internal.SessionFactoryImpl.<init>(SessionFactoryImpl.java:265)
            at

So it's definitely the result of this change.

.idea/codeStyles/codeStyleConfig.xml

hibernate-core/src/main/java/org/hibernate/mapping/Value.java

beikov · 2025-12-31T09:31:13Z

hibernate-core/src/main/java/org/hibernate/mapping/Value.java

+					catalog = primaryTable.getCatalog() != null ? Identifier.toIdentifier( primaryTable.getCatalog() ) : null;
+					schema = primaryTable.getSchema() != null ? Identifier.toIdentifier( primaryTable.getSchema() ) : null;
+					table = primaryTable.getName() != null ? Identifier.toIdentifier( primaryTable.getName() ) : null;


Suggested change

catalog = primaryTable.getCatalog() != null ? Identifier.toIdentifier( primaryTable.getCatalog() ) : null;

schema = primaryTable.getSchema() != null ? Identifier.toIdentifier( primaryTable.getSchema() ) : null;

table = primaryTable.getName() != null ? Identifier.toIdentifier( primaryTable.getName() ) : null;

catalog = primaryTable.getCatalogIdentifier();

schema = primaryTable.getSchemaIdentifier();

table = primaryTable.getNameIdentifier();

beikov · 2025-12-31T09:32:10Z

hibernate-core/src/main/java/org/hibernate/mapping/Value.java

+					table = primaryTable.getName() != null ? Identifier.toIdentifier( primaryTable.getName() ) : null;
+				}
+
+				Identifier columnName = Identifier.toIdentifier( col.getName() );


Suggested change

Identifier columnName = Identifier.toIdentifier( col.getName() );

Identifier columnName = col.getNameIdentifier( getBuildingContext() );

beikov · 2025-12-31T09:32:53Z

hibernate-core/src/main/java/org/hibernate/mapping/Value.java

+				final QualifiedColumnName qualified = new QualifiedColumnName( catalog, schema, table, columnName );
+
+				if ( !distinctColumns.add( qualified ) ) {


Suggested change

final QualifiedColumnName qualified = new QualifiedColumnName( catalog, schema, table, columnName );

if ( !distinctColumns.add( qualified ) ) {

if ( !distinctColumns.add( new QualifiedColumnName( catalog, schema, table, columnName ) ) ) {

@beikov Thank you for the review! I have updated the code to use the direct identifier getters as suggested.

HHH-12678 Fix checkColumnDuplication failure for columns with same na…

2f52165

…me from distinct tables

gavinking reviewed Dec 28, 2025

View reviewed changes

HHH-12678 Address review comments: Remove IDE config and refactor dup…

8971c53

…lication check

MohammedAymanKhan force-pushed the HHH-12678-column-duplication-fix branch from bbbed6d to 8971c53 Compare December 28, 2025 11:31

HHH-12678 Fix NullPointerException in duplicate column check

c570f04

gavinking reviewed Dec 30, 2025

View reviewed changes

.idea/codeStyles/codeStyleConfig.xml Show resolved Hide resolved

beikov reviewed Dec 30, 2025

View reviewed changes

hibernate-core/src/main/java/org/hibernate/mapping/Value.java Outdated Show resolved Hide resolved

HHH-12678 Use QualifiedColumnName record for column duplication check

0785fc7

beikov requested changes Dec 31, 2025

View reviewed changes

HHH-12678 Use direct Identifier getters for validation

24b2109

		String tableName = ( getTable() != null ) ? getTable().getName() : "";
		String uniqueKey = tableName.isEmpty() ? col.getName() : tableName + "." + col.getName();

-				String tableName = ( getTable() != null ) ? getTable().getName() : "";
-				String uniqueKey = tableName.isEmpty() ? col.getName() : tableName + "." + col.getName();
+                final var primaryTable = getTable();
+				final String tableName =  primaryTable != null ? primaryTable.getName() : "";
+				final String uniqueKey = tableName.isEmpty() ? col.getName() : tableName + "." + col.getName();

	Identifier columnName = Identifier.toIdentifier( col.getName() );
	Identifier columnName = col.getNameIdentifier( getBuildingContext() );

		final QualifiedColumnName qualified = new QualifiedColumnName( catalog, schema, table, columnName );

		if ( !distinctColumns.add( qualified ) ) {

Uh oh!

HHH-12678 Fix checkColumnDuplication failure for columns with same name from distinct tables #11512

Are you sure you want to change the base?

HHH-12678 Fix checkColumnDuplication failure for columns with same name from distinct tables #11512

Conversation

MohammedAymanKhan commented Dec 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Issue

Changes

Test

Uh oh!

hibernate-github-bot bot commented Dec 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gavinking left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MohammedAymanKhan commented Dec 28, 2025

Uh oh!

gavinking commented Dec 29, 2025

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

MohammedAymanKhan commented Dec 28, 2025 •

edited

Loading

hibernate-github-bot bot commented Dec 28, 2025 •

edited

Loading