HHH-16578 - Make the column type comparison in ColumnDefinitions somewhat more flexible

Signed-off-by: Jan Schatteman <jschatte@redhat.com>

Author: jrenaat

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

@@ -25,7 +25,7 @@ class ColumnDefinitions {
 
 	static boolean hasMatchingType(Column column, ColumnInformation columnInformation, Metadata metadata, Dialect dialect) {
 		boolean typesMatch = dialect.equivalentTypes( column.getSqlTypeCode(metadata), columnInformation.getTypeCode() )
-				|| stripArgs( column.getSqlType( metadata ) ).equalsIgnoreCase( columnInformation.getTypeName() );
+				|| hasSameColumnType( stripArgs( column.getSqlType( metadata ) ), columnInformation.getTypeName() );
 		if ( typesMatch ) {
 			return true;
 		}
@@ -43,6 +43,21 @@ static boolean hasMatchingType(Column column, ColumnInformation columnInformatio
 		}
 	}
 
+	private static boolean hasSameColumnType(String metadataColumnTypeString, String columnInformationColumnTypeString) {
+		/*
+		 tokenize the metadata column type string, since that could include more than just the type information, such as e.g. 'unsigned',
+		 and we can't just check if it contains the other one, since that would fail with e.g. tinyint and int
+		 the column information type string, as per InformationExtractorJdbcDatabaseMetaDataImpl.addColumns (L160) should already
+		 only contain a single string
+		*/
+		for (String s : metadataColumnTypeString.split( " " ) ) {
+			if ( s.equalsIgnoreCase( columnInformationColumnTypeString ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	static boolean hasMatchingLength(Column column, ColumnInformation columnInformation, Metadata metadata, Dialect dialect) {
 		final int actualSize = columnInformation.getColumnSize();
 		if ( actualSize == 0 ) {

hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/MySQLColumnValidationTest.java

@@ -113,9 +113,7 @@ public void releaseResources() {
 			fail(e.getMessage());
 		}
 
-		if ( connectionProvider != null ) {
-			connectionProvider.stop();
-		}
+		connectionProvider.stop();
 	}
 
 	@Test