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

improve sql parser