From 8375b8ee6da72152193df409c91f7f35f71b6836 Mon Sep 17 00:00:00 2001
From: Roberto Miranda <rjmaltamar@gmail.com>
Date: Wed, 27 Mar 2019 17:10:44 +0000
Subject: [PATCH] Move db:migrate call to else block

---
 activerecord/lib/active_record/railties/databases.rake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 2328529817..b022fe942a 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -225,9 +225,10 @@ db_namespace = namespace :db do
   desc "Setup database if doesn’t exist already and run migrations"
   task prepare: :load_config do
     ActiveRecord::Base.connection
-    db_namespace["migrate"].invoke
   rescue ActiveRecord::NoDatabaseError
     db_namespace["setup"].invoke
+  else
+    db_namespace["migrate"].invoke
   end
 
   desc "Loads the seed data from db/seeds.rb"