more complete support for sql language
Merge pull request #808 from ZhengYang/develop

more complete support for sql language