Enforces non-emptiness tests

Adds original schema.sql
Corrects indentation