sql parser refactor, rename field