The refactoring in https://github.com/hibernate/hibernate-orm/commit/18ddbe15d6a8b83f3bae25183518640b8c615cc7 introduced a regression which causes com/sun/ts/tests/jpa/se/schemaGeneration/scripts/Client tests to fail.