Handle numbers underscore separation when mapping camelCase containing a number to snake_case

Author: LE FAUCHEUR Brieuc

spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java

@@ -523,8 +523,9 @@ public static String convertPropertyNameToUnderscoreName(@Nullable String name)
 			char c = name.charAt(i);
 			if (Character.isUpperCase(c)) {
 				result.append('_').append(Character.toLowerCase(c));
-			}
-			else {
+			} else if (Character.isDigit(c) && !Character.isDigit(name.charAt(i - 1))) {
+				result.append('_').append(c);
+			} else {
 				result.append(c);
 			}
 		}

spring-jdbc/src/test/java/org/springframework/jdbc/support/JdbcUtilsTests.java

@@ -58,4 +58,11 @@ void convertUnderscoreNameToPropertyName() {
 		assertThat(JdbcUtils.convertUnderscoreNameToPropertyName("some_name_with_1_digit")).isEqualTo("someNameWith1Digit");
 	}
 
+	@Test
+	void convertPropertyNameToUnderscoreName() {
+		assertThat(JdbcUtils.convertPropertyNameToUnderscoreName("AName")).isEqualTo("a_name");
+		assertThat(JdbcUtils.convertPropertyNameToUnderscoreName("someoneElsesName")).isEqualTo("someone_elses_name");
+		assertThat(JdbcUtils.convertPropertyNameToUnderscoreName("someNameWith1Digit")).isEqualTo("some_name_with_1_digit");
+		assertThat(JdbcUtils.convertPropertyNameToUnderscoreName("someNameWith12Number")).isEqualTo("some_name_with_12_number");
+	}
 }