Refactor: separate SQL generation, rename things
simple test for wrap top-level OR
bump to 0.2.0