add checks for whether DATABASE_URI exsits
Merge remote-tracking branch 'origin/postgres' into postgres