Andrei, I don't think your fix was quite right and I've created a new pull request: https://github.com/hibernate/hibernate-orm/pull/2003

We don't have access to HANA, so we have no way to test it. Please give the new pull request a try and let us know if it works for you.

If you can do it in the next 24 hours, I'll get it fixed in 5.2.11; otherwise, it will have to wait for 5.2.12.