HQLPARSER-7

Based on top of https://github.com/hibernate/hibernate-jpql-parser/pull/7