refactor
improve sql parser