On exceptions, the originating query is mostly empty. Passing the query in the exception would make debugging and analysing easier. Affected are I think all the versions, at least 4.2.21 and 5.0.0.CR3.

The implementation should be quick: In the various methods of ResultSetReturnImpl, by sqlExceptionHelper.convert(...), just call the convert with the sql as String on 3rd argument, it's already available. Better but not necessary would be to render the field sql in JDBCException.getMessage().