Using the ground work from HHH-12993 Closed , I was able to finish my patch in https://github.com/hibernate/hibernate-orm/pull/3109