Add brackets around order by columns

I have ran TestCubeQueryRewriter and HQLParser tests