add more sql keywords
minor code refactor
Merge pull request #812 from ZhengYang/develop

More SQL keywords added and code cleanup