HHH-10718 - Fix Underscore in table name can result in SchemaExtractionException: More than one table found

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

@@ -361,19 +361,11 @@ public class InformationExtractorJdbcDatabaseMetaDataImpl implements Information
 			Identifier tableName,
 			ResultSet resultSet) throws SQLException {
 		try {
-			if ( !resultSet.next() ) {
+			boolean found = false;
-				log.tableNotFound( tableName.render() );
+			TableInformation tableInformation = null;
-				return null;
+			while ( resultSet.next() ) {
-			}
+				if ( tableName.equals( identifierHelper().toIdentifier( resultSet.getString( "TABLE_NAME" ) ) ) ) {
-
+					if ( found ) {
-			final TableInformation tableInformation = extractTableInformation(
-					catalog,
-					schema,
-					tableName,
-					resultSet
-			);
-
-			if ( resultSet.next() ) {
 						log.multipleTablesFound( tableName.render() );
 						final String catalogName = catalog == null ? "" : catalog.render();
 						final String schemaName = schema == null ? "" : schema.render();
@@ -387,7 +379,21 @@ public class InformationExtractorJdbcDatabaseMetaDataImpl implements Information
 								)
 						);
 					}
+					else {
+						found = true;
+						tableInformation = extractTableInformation(
+								catalog,
+								schema,
+								tableName,
+								resultSet
+						);
 
+					}
+				}
+			}
+			if ( !found ) {
+				log.tableNotFound( tableName.render() );
+			}
 			return tableInformation;
 		}
 		finally {