small fixes to sql-rewrite to make the test run without errors
Merge pull request #60 from adrpar/master

small fixes to sql-rewrite to make the test run without errors