improve sql parser
Merge pull request #655 from wenshao/master

improve sql parser