Move joins to new expression format
Only escape queries automatically
Add join_builder_test