From c29df1aa4620643843cc57cb67e7795f9b9d0933 Mon Sep 17 00:00:00 2001 From: James Mason Date: Wed, 26 Sep 2018 19:47:13 -0700 Subject: [PATCH] Sqlite dbs should be db/*.sqlite3 --- config/database.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/config/database.yml b/config/database.yml index dd8ac693..689e2452 100644 --- a/config/database.yml +++ b/config/database.yml @@ -3,6 +3,13 @@ if ENV['OSEM_DB_ADAPTER'] == 'mysql2' encoding = 'utf8' end + + development_database = ENV['OSEM_DB_NAME'] || 'osem_development' + test_database = ENV['OSEM_DB_NAME'] || 'osem_test' + if ENV['OSEM_DB_ADAPTER'] == 'sqlite3' + development_database = "db/#{development_database}.sqlite3" + test_database = "db/#{test_database}.sqlite3" + end %> @@ -19,14 +26,14 @@ default: &default development: <<: *default - database: osem_development + database: <%= development_database %> # Warning: The database defined as "test" will be erased and # re-generated when you run "rake". # Do not set this db to the same as development or production. test: <<: *default - database: osem_test + database: <%= test_database %> production: <<: *default