change order and account usage of destory_database for postgres to make it work
Merge branch 'foo'