change database to postgres
Merge branch 'postgres'