The problem right now is that the latest changes done by @afinne are Postgres-only, since they use UPSERT etc, which is not available in SQLite.
Either we:
- make the code handle both scenarios, with if-statements or similar, or
- change Travis to use Postgres for its test runs.