improve sql parser
Merge pull request #722 from yakolee/master

improve sql parser