HHH-17233 be a little more forgiving when comparing column types in schema validation

this "fix" is not really strictly-speaking necessary, but it does reduce false positives
in a very tiny number of cases

Author: gavinking

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ColumnDefinitions.java

@@ -20,6 +20,7 @@
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 
 import java.util.List;
+import java.util.Locale;
 
 import static org.hibernate.type.SqlTypes.isNumericOrDecimal;
 import static org.hibernate.type.SqlTypes.isStringType;
@@ -28,7 +29,7 @@ class ColumnDefinitions {
 
 	static boolean hasMatchingType(Column column, ColumnInformation columnInformation, Metadata metadata, Dialect dialect) {
 		boolean typesMatch = dialect.equivalentTypes( column.getSqlTypeCode(metadata), columnInformation.getTypeCode() )
-				|| stripArgs( getSqlType( column, metadata ) ).equalsIgnoreCase( columnInformation.getTypeName() );
+				|| normalize( stripArgs( getSqlType( column, metadata ) ) ).equals( normalize( columnInformation.getTypeName() ) );
 		if ( typesMatch ) {
 			return true;
 		}
@@ -239,8 +240,32 @@ private static boolean isPrimaryKeyIdentity(Table table, Metadata metadata, Dial
 						);
 	}
 
-	private static String stripArgs(String string) {
-		int i = string.indexOf( '(' );
-		return i > 0 ? string.substring( 0, i ).trim() : string;
+	private static String normalize(String typeName) {
+		if ( typeName == null ) {
+			return null;
+		}
+		else {
+			final String lowerCaseTypName = typeName.toLowerCase(Locale.ROOT);
+			switch (lowerCaseTypName) {
+				case "character":
+					return "char";
+				case "character varying":
+					return "varchar";
+				case "binary varying":
+					return "varbinary";
+				default:
+					return lowerCaseTypName;
+			}
+		}
+	}
+
+	private static String stripArgs(String typeExpression) {
+		if ( typeExpression == null ) {
+			return null;
+		}
+		else {
+			int i = typeExpression.indexOf( '(' );
+			return i > 0 ? typeExpression.substring( 0, i ).trim() : typeExpression;
+		}
 	}
 }