From 16141487d57343c9d0bf92f8c73116b5c37554cc Mon Sep 17 00:00:00 2001
From: Gavin King <gavin@hibernate.org>
Date: Sun, 24 Nov 2024 21:49:58 +0100
Subject: [PATCH] HHH-14519 improve error message

fix by @karge-itestra Tassilo Karge
---
 .../boot/internal/InFlightMetadataCollectorImpl.java  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java
index e722df4dc8..e4e7472750 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java
@@ -1216,7 +1216,16 @@ public void addColumnNameBinding(Table table, Identifier logicalName, Column col
 
 	@Override
 	public String getPhysicalColumnName(Table table, String logicalName) throws MappingException {
-		return getPhysicalColumnName( table, getDatabase().toIdentifier( logicalName ) );
+		final Identifier identifier = getDatabase().toIdentifier( logicalName );
+		if ( identifier == null ) {
+			throw new MappingException( String.format(
+					Locale.ENGLISH,
+					"Column with logical name '%s' in table '%s' cannot be mapped to column identifier",
+					logicalName,
+					table.getName()
+			) );
+		}
+		return getPhysicalColumnName( table, identifier );
 	}
 
 	@Override