diff --git a/.travis.yml b/.travis.yml index 9603840c99..4d9301a327 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ services: postgresql before_install: before_script: - cp config/database.travis.yml config/database.yml - - psql -c 'create database open_food_web_test;' -U postgres + - psql -c 'create database open_food_network_test;' -U postgres script: - RAILS_ENV=test bundle exec rake db:migrate --trace - bundle exec rake spec diff --git a/config/database.travis.yml b/config/database.travis.yml index 712a914658..78f00ca705 100644 --- a/config/database.travis.yml +++ b/config/database.travis.yml @@ -1,4 +1,4 @@ test: adapter: postgresql - database: open_food_web_test + database: open_food_network_test username: postgres diff --git a/config/database.yml b/config/database.yml index 8b2e68daf5..1fdfe13665 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,34 +1,34 @@ development: adapter: postgresql encoding: unicode - database: open_food_web_dev + database: open_food_network_dev pool: 5 host: localhost - username: ofw + username: ofn password: f00d test: adapter: postgresql encoding: unicode - database: open_food_web_test + database: open_food_network_test pool: 5 host: localhost - username: ofw + username: ofn password: f00d #not used with heroku production: adapter: postgresql encoding: unicode - database: open_food_web_prod + database: open_food_network_prod pool: 5 - username: ofw + username: ofn password: f00d staging: adapter: postgresql encoding: unicode - database: open_food_web_prod + database: open_food_network_prod pool: 5 - username: ofw + username: ofn password: f00d \ No newline at end of file diff --git a/script/mirror_prod.sh b/script/mirror_prod.sh index d705d30402..e5bfb37537 100755 --- a/script/mirror_prod.sh +++ b/script/mirror_prod.sh @@ -2,6 +2,6 @@ set -e -echo "drop database open_food_web_dev" | psql -h localhost -U ofw open_food_web_test -echo "create database open_food_web_dev" | psql -h localhost -U ofw open_food_web_test -ssh ofw-prod "pg_dump -h localhost -U openfoodweb openfoodweb_production |gzip" |gunzip |psql -h localhost -U ofw open_food_web_dev +echo "drop database open_food_network_dev" | psql -h localhost -U ofn open_food_network_test +echo "create database open_food_network_dev" | psql -h localhost -U ofn open_food_network_test +ssh ofn-prod "pg_dump -h localhost -U openfoodweb openfoodweb_production |gzip" |gunzip |psql -h localhost -U ofn open_food_network_dev