HHH-17310: Bug with names with digits in CamelCaseToUnderscoresNamingStrategy

hibernate-core/src/main/java/org/hibernate/boot/model/naming/CamelCaseToUnderscoresNamingStrategy.java

@@ -86,7 +86,8 @@ public class CamelCaseToUnderscoresNamingStrategy implements PhysicalNamingStrat
 	}
 
 	private boolean isUnderscoreRequired(final char before, final char current, final char after) {
-		return Character.isLowerCase( before ) && Character.isUpperCase( current ) && Character.isLowerCase( after );
+		return ( Character.isLowerCase( before ) || Character.isDigit( before ) ) && Character.isUpperCase( current ) && ( Character.isLowerCase(
+				after ) || Character.isDigit( after ) );
 	}
 
 }

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/CamelCaseToUnderscoresNamingStrategyTest.java

@@ -0,0 +1,125 @@
+package org.hibernate.orm.test.annotations.namingstrategy;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy;
+import org.hibernate.cfg.Environment;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Selectable;
+import org.hibernate.service.ServiceRegistry;
+
+import org.hibernate.testing.ServiceRegistryBuilder;
+import org.hibernate.testing.junit4.BaseUnitTestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Test harness for HHH-17310.
+ *
+ * @author Anilabha Baral
+ */
+public class CamelCaseToUnderscoresNamingStrategyTest extends BaseUnitTestCase {
+
+	private ServiceRegistry serviceRegistry;
+
+	@Before
+	public void setUp() {
+		serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() );
+	}
+
+	@After
+	public void tearDown() {
+		if ( serviceRegistry != null ) {
+			ServiceRegistryBuilder.destroy( serviceRegistry );
+		}
+	}
+
+	@Test
+	public void testWithWordWithDigitNamingStrategy() throws Exception {
+		Metadata metadata = new MetadataSources( serviceRegistry )
+				.addAnnotatedClass( B.class )
+				.getMetadataBuilder()
+				.applyPhysicalNamingStrategy( new CamelCaseToUnderscoresNamingStrategy() )
+				.build();
+
+		PersistentClass entityBinding = metadata.getEntityBinding( B.class.getName() );
+		assertEquals(
+				"word_with_digit_d1",
+				( (Selectable) entityBinding.getProperty( "wordWithDigitD1" ).getSelectables().get( 0 ) ).getText()
+		);
+		assertEquals(
+				"abcd_efgh_i21",
+				( (Selectable) entityBinding.getProperty( "AbcdEfghI21" ).getSelectables().get( 0 ) ).getText()
+		);
+		assertEquals(
+				"hello1",
+				( (Selectable) entityBinding.getProperty( "hello1" ).getSelectables().get( 0 ) ).getText()
+		);
+		assertEquals(
+				"hello1_d2",
+				( (Selectable) entityBinding.getProperty( "hello1D2" ).getSelectables().get( 0 ) ).getText()
+		);
+		assertEquals(
+				"hello3d4",
+				( (Selectable) entityBinding.getProperty( "hello3d4" ).getSelectables().get( 0 ) ).getText()
+		);
+	}
+
+	@Entity
+	@Table(name = "ABCD")
+	class B implements java.io.Serializable {
+		@Id
+		protected String AbcdEfghI21;
+		protected String wordWithDigitD1;
+		protected String hello1;
+		protected String hello1D2;
+		protected String hello3d4;
+
+		public String getAbcdEfghI21() {
+			return AbcdEfghI21;
+		}
+
+		public void setAbcdEfghI21(String abcdEfghI21) {
+			AbcdEfghI21 = abcdEfghI21;
+		}
+
+		public String getWordWithDigitD1() {
+			return wordWithDigitD1;
+		}
+
+		public void setWordWithDigitD1(String wordWithDigitD1) {
+			this.wordWithDigitD1 = wordWithDigitD1;
+		}
+
+		public String getHello1() {
+			return hello1;
+		}
+
+		public void setHello1(String hello1) {
+			this.hello1 = hello1;
+		}
+
+		public String getHello1D2() {
+			return hello1D2;
+		}
+
+		public void setHello1D2(String hello1D2) {
+			this.hello1D2 = hello1D2;
+		}
+
+		public String getHello3d4() {
+			return hello3d4;
+		}
+
+		public void setHello3d4(String hello3d4) {
+			this.hello3d4 = hello3d4;
+		}
+	}
+}