Hello Čedomir Igaly, thanks for the tests and the contribution.

Your proposed solution looked fine to me. I’ve opened an alternative PR with simpler tests and a slightly more generalized fix.

Note that we will only fix this in Hibernate 6.2 since we’re not releasing new maintenance versions for 6.1.