Merge pull request #548 from wenshao/master

improve sql parser
Merge pull request #549 from wenshao/master

'druid-1.0.6'
Merge pull request #550 from wenshao/master

remove test
fixed testcase