Merge pull request #9813 from dmarcoux/simplify-rake-db-calls

Simplify rake db:* calls
openSUSE · Jun 23, 2020 · fe1c57b · fe1c57b
2 parents d472654 + 57f24ec
commit fe1c57b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -40,7 +40,7 @@ aliases:
 
   - &create_test_db
     name: Create database
-    command: cd src/api; bundle exec rake db:create db:structure:load db:seed RAILS_ENV=test
+    command: cd src/api; bundle exec rake db:setup RAILS_ENV=test
 
   - &bootstrap_old_test_suite
     name: Setup application

diff --git a/dist/obs-api-testsuite-rspec.spec b/dist/obs-api-testsuite-rspec.spec
@@ -57,7 +57,7 @@ bundle --local --path %_libdir/obs-api/
 ./script/prepare_spec_tests.sh
 
 export RAILS_ENV=test
-bin/rake db:create db:structure:load db:seed
+bin/rake db:setup
 bin/rails assets:precompile
 
 bin/rspec -f d --exclude-pattern 'spec/db/**/*_spec.rb'

diff --git a/dist/setup-appliance.sh b/dist/setup-appliance.sh
@@ -277,7 +277,7 @@ function prepare_database_setup {
   if [ -n "$RUN_INITIAL_SETUP" ]; then
     logline "Initialize OBS api database (first time only)"
     cd $apidir
-    RAKE_COMMANDS="db:create db:structure:load db:seed writeconfiguration"
+    RAKE_COMMANDS="db:setup writeconfiguration"
   else
     logline "Migrate OBS api database"
     cd $apidir

diff --git a/src/api/lib/tasks/dev.rake b/src/api/lib/tasks/dev.rake
@@ -32,9 +32,7 @@ namespace :dev do
     begin
       Rake::Task['db:version'].invoke
     rescue
-      Rake::Task['db:create'].invoke
-      Rake::Task['db:structure:load'].invoke
-      Rake::Task['db:seed'].invoke
+      Rake::Task['db:setup'].invoke
       if args.old_test_suite
         puts 'Old test suite. Loading fixtures...'
         Rake::Task['db:fixtures:load'].invoke
@@ -256,10 +254,7 @@ namespace :dev do
       include ActiveSupport::Testing::TimeHelpers
 
       Rails.cache.clear
-      Rake::Task['db:drop'].invoke
-      Rake::Task['db:create'].invoke
-      Rake::Task['db:structure:load'].invoke
-      Rake::Task['db:seed'].invoke
+      Rake::Task['db:reset'].invoke
 
       # enable responsive_ux as default
       Flipper[:responsive_ux].enable

diff --git a/src/api/script/api_minitest.sh b/src/api/script/api_minitest.sh
@@ -14,7 +14,7 @@ bin/rake db:migrate:with_data db:structure:dump db:drop
 
 # entire test suite
 export RAILS_ENV=test
-bin/rake db:create db:structure:load db:seed
+bin/rake db:setup
 
 bin/rails assets:precompile