Skip to content

HHH-19969 - Fix and test for error in camel to snake case conversion #11396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jrenaat wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −11
Open

HHH-19969 - Fix and test for error in camel to snake case conversion #11396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions ...re/src/main/java/org/hibernate/boot/model/naming/PhysicalNamingStrategySnakeCaseImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,17 @@ else if ( name.isQuoted() ) {

private String camelCaseToSnakeCase(String name) {
final StringBuilder builder = new StringBuilder( name.replace( '.', '_' ) );
for ( int i = 1; i < builder.length() - 1; i++ ) {
if ( isUnderscoreRequired( builder.charAt( i - 1 ), builder.charAt( i ), builder.charAt( i + 1 ) ) ) {
builder.insert( i++, '_' );
final char[] copy = builder.toString().toCharArray();
int builderIndex = 1;
for ( int i = 1; i <= copy.length - 1; i++ ) {
if ( isUnderscoreRequired(
copy[i - 1],
copy[i],
i == copy.length - 1 ? '*' : copy[i + 1] ) // add some fictitious final character
) {
builder.insert( builderIndex++, '_' );
}
builderIndex++;
}
return builder.toString();
}
Expand All @@ -79,6 +86,6 @@ protected Identifier quotedIdentifier(Identifier quotedName) {
private boolean isUnderscoreRequired(final char before, final char current, final char after) {
return ( isLowerCase( before ) || isDigit( before ) )
&& isUpperCase( current )
&& ( isLowerCase( after ) || isDigit( after ) );
&& ( isLowerCase( after ) || isDigit( after ) || after == '*' );
}
}
17 changes: 10 additions & 7 deletions ...bernate/orm/test/annotations/namingstrategy/CamelCaseToUnderscoresNamingStrategyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,22 @@ public void testWithWordWithDigitNamingStrategy() {
.isEqualTo( "hello3d4" );
assertThat( entityBinding.getProperty( "quoted" ).getSelectables().get( 0 ).getText() )
.isEqualTo( "Quoted-ColumnName" );
assertThat( entityBinding.getProperty( "wordX" ).getSelectables().get( 0 ).getText() )
.isEqualTo( "word_x" );
}

@Entity
@Table(name = "ABCD")
class B implements java.io.Serializable {
private static class B implements java.io.Serializable {
@Id
protected String AbcdEfghI21;
protected String wordWithDigitD1;
protected String hello1;
protected String hello1D2;
protected String hello3d4;
private String AbcdEfghI21;
private String wordWithDigitD1;
private String hello1;
private String hello1D2;
private String hello3d4;
@Column(name = "\"Quoted-ColumnName\"")
protected String quoted;
private String quoted;
private String wordX;

public String getAbcdEfghI21() {
return AbcdEfghI21;
Expand Down
Loading