Enhance JavaCC Compiler

I have a running application with existing SQL Parser generated by JavaCC. I would like to improve JavaCC grammar supporting newest features of SQL Rules.
Mainly Lex an Jacc knowledge is needed.
Sql Grammar.
PostgreSql DB is used.

I am flexible with budget and deadline