The problem is very similar to https://hibernate.atlassian.net/browse/HHH-16136 but requires a slightly modified test case.

When the previous issue was fixed here:

https://github.com/hibernate/hibernate-orm/pull/6095

Both the test case in the previous issue and in this issue were passing.

I suspect (but not completely sure) that these changes broke the additional test case are these:

https://github.com/hibernate/hibernate-orm/pull/6146

(I’ll add a test case in a few minutes, just need to create the issue in order to get the issue number)