improve sql parser
merge
Merge pull request #548 from wenshao/master

improve sql parser