resolves #668

[ymajoros]

No description provided.

[ymajoros]

#675 actually solves it in a better way. They could still be split in 2, but I think it's not worth it, as further refactorings were needed.

[vladmihalcea]

@ymajoros Why make all these changes instead of just doing this instead?

String sql = SQLExtractor.from(criteriaQuery.unwrap(Query.class));

[ymajoros]

@vladmihalcea this seems to indeed simplify it. I updated #675 with that, as it was needed there as well.