Merge pull request #94 from nimblehq/chore/update-config

Update database config

Author: olivierobert

shared/config/application.yml

@@ -1,4 +1,5 @@
 default: &default
+  DB_NAME: "#{app_name}"
   DB_HOST: "localhost"
   DB_PORT: "5432"
   USERNAME: "postgres"
@@ -8,11 +9,9 @@ default: &default
 
 development:
   <<: *default
-  DB_NAME: "#{app_name}_development"
   SECRET_KEY_BASE: "#{secret_key_base}"
 
 test:
   <<: *default
-  DB_NAME: "#{app_name}_test"
   TEST_RETRY: "0"
   SECRET_KEY_BASE: "#{secret_key_base}"

shared/config/database.yml

@@ -8,14 +8,14 @@ development:
   host:     <%= ENV['DB_HOST'] %>
   port:     <%= ENV['DB_PORT'] %>
   username: <%= ENV['USERNAME'] %>
-  database: <%= ENV['DB_NAME'] %>
+  database: <%= ENV['DB_NAME'] %>_development
 
 test:
   <<: *default
   host:     <%= ENV['DB_HOST'] %>
   port:     <%= ENV['DB_PORT'] %>
   username: <%= ENV['USERNAME'] %>
-  database: <%= ENV['DB_NAME'] %>
+  database: <%= ENV['DB_NAME'] %>_test
 
 production:
   url: <%= ENV['DATABASE_URL'] %>