HHH-16516 test for automatic quoting

Author: gavinking

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

@@ -5,6 +5,7 @@
 package org.hibernate.boot.model.naming;
 
 import java.util.Locale;
+import java.util.Objects;
 
 import org.hibernate.dialect.Dialect;
 
@@ -112,6 +113,7 @@ else if ( quoteOnNonIdentifierChar && !quote ) {
 			else {
 				for ( int i = start + 1; i < end; i++ ) {
 					c = text.charAt( i );
+					// every database except HSQLDB also allows a $ here
 					if ( !isLetterOrDigit( c ) && c != '_' ) {
 						quote = true;
 						break;
@@ -236,11 +238,9 @@ public String toString() {
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( !(o instanceof Identifier that) ) {
-			return false;
-		}
-		return getCanonicalName().equals( that.getCanonicalName() );
+	public boolean equals(Object object) {
+		return object instanceof Identifier that
+		   && getCanonicalName().equals( that.getCanonicalName() );
 	}
 
 	public boolean matches(String name) {
@@ -251,16 +251,13 @@ public boolean matches(String name) {
 
 	@Override
 	public int hashCode() {
-		return isQuoted ? text.hashCode() : text.toLowerCase( Locale.ENGLISH ).hashCode();
+		return isQuoted
+				? text.hashCode()
+				: text.toLowerCase( Locale.ENGLISH ).hashCode();
 	}
 
 	public static boolean areEqual(Identifier id1, Identifier id2) {
-		if ( id1 == null ) {
-			return id2 == null;
-		}
-		else {
-			return id1.equals( id2 );
-		}
+		return Objects.equals( id1, id2 );
 	}
 
 	public static Identifier quote(Identifier identifier) {

hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/NormalizingIdentifierHelperImpl.java

@@ -133,43 +133,46 @@ private String toMetaDataText(Identifier identifier) {
 			throw new IllegalArgumentException( "Identifier cannot be null; bad usage" );
 		}
 
+		final String text = identifier.getText();
 		if ( identifier instanceof DatabaseIdentifier ) {
-			return identifier.getText();
+			return text;
 		}
-
-		if ( identifier.isQuoted() ) {
-			switch ( quotedCaseStrategy ) {
-				case UPPER: {
-					log.tracef( "Rendering quoted identifier [%s] in upper case for use in DatabaseMetaData", identifier );
-					return identifier.getText().toUpperCase( Locale.ROOT );
+		else if ( identifier.isQuoted() ) {
+			return switch ( quotedCaseStrategy ) {
+				case UPPER -> {
+					log.tracef( "Rendering quoted identifier [%s] in upper case for use in DatabaseMetaData",
+							identifier );
+					yield text.toUpperCase( Locale.ROOT );
 				}
-				case LOWER: {
-					log.tracef( "Rendering quoted identifier [%s] in lower case for use in DatabaseMetaData", identifier );
-					return identifier.getText().toLowerCase( Locale.ROOT );
+				case LOWER -> {
+					log.tracef( "Rendering quoted identifier [%s] in lower case for use in DatabaseMetaData",
+							identifier );
+					yield text.toLowerCase( Locale.ROOT );
 				}
-				default: {
+				default -> {
 					// default is mixed case
-					log.tracef( "Rendering quoted identifier [%s] in mixed case for use in DatabaseMetaData", identifier );
-					return identifier.getText();
+					log.tracef( "Rendering quoted identifier [%s] in mixed case for use in DatabaseMetaData",
+							identifier );
+					yield text;
 				}
-			}
+			};
 		}
 		else {
-			switch ( unquotedCaseStrategy ) {
-				case MIXED: {
+			return switch ( unquotedCaseStrategy ) {
+				case MIXED -> {
 					log.tracef( "Rendering unquoted identifier [%s] in mixed case for use in DatabaseMetaData", identifier );
-					return identifier.getText();
+					yield text;
 				}
-				case LOWER: {
+				case LOWER -> {
 					log.tracef( "Rendering unquoted identifier [%s] in lower case for use in DatabaseMetaData", identifier );
-					return identifier.getText().toLowerCase( Locale.ROOT );
+					yield text.toLowerCase( Locale.ROOT );
 				}
-				default: {
+				default -> {
 					// default is upper case
 					log.tracef( "Rendering unquoted identifier [%s] in upper case for use in DatabaseMetaData", identifier );
-					return identifier.getText().toUpperCase( Locale.ROOT );
+					yield text.toUpperCase( Locale.ROOT );
 				}
-			}
+			};
 		}
 	}
 

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/autoquote/SpecialCharactersTest.java

@@ -0,0 +1,31 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.autoquote;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+@Jpa(annotatedClasses = SpecialCharactersTest.Simple.class)
+public class SpecialCharactersTest {
+	@Test void test(EntityManagerFactoryScope scope) {
+		scope.getEntityManagerFactory();
+	}
+	@Entity static class Simple {
+		@Id
+		long id;
+		@Column(name="NAME$NAME")
+		String nameWithDollar;
+		@Column(name="$NAME")
+		String nameWithInitialDollar;
+		@Column(name="NAME#NAME")
+		String nameWithHash;
+		@Column(name="NAME NAME")
+		String nameWithSpace;
+	}
+}