The fixed applied for[ https://hibernate.atlassian.net/browse/HHH-10443] should solve also this issue.

The fix https://github.com/hibernate/hibernate-orm/commit/8dd86a218304fc33eeac5c29f3603b498d82fae1 with a test https://github.com/hibernate/hibernate-orm/commit/a982b5674e79155a2275964395a099dff29d0c05 will be in 5.0.8 release