Fixes an issue where migrations instead of schema loading were run

If you called rake gitlab:db:drop_tables before running gitlab-ctl
reconfigure (or rake gitlab:db:configure)

1 files changed, 3 insertions, 1 deletions

diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake
index 139ab70e125..69166851816 100644
--- a/lib/tasks/gitlab/db.rake
+++ b/lib/tasks/gitlab/db.rake
@@ -46,7 +46,9 @@ namespace :gitlab do
 
     desc 'Configures the database by running migrate, or by loading the schema and seeding if needed'
     task configure: :environment do
-      if ActiveRecord::Base.connection.tables.any?
+      # Check if we have existing db tables
+      # The schema_migrations table will still exist if drop_tables was called
+      if ActiveRecord::Base.connection.tables.count > 1
         Rake::Task['db:migrate'].invoke
       else
         Rake::Task['db:schema:load'].invoke