diff options
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/gitlab/db.rake | 4 | ||||
| -rw-r--r-- | lib/tasks/migrate/schema_check.rake | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake index 3a371de5bb7..4e7a8adbef6 100644 --- a/lib/tasks/gitlab/db.rake +++ b/lib/tasks/gitlab/db.rake @@ -53,10 +53,6 @@ namespace :gitlab do # 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 - if ActiveRecord::Migrator.current_version < Gitlab::Database::MIN_SCHEMA_VERSION - raise "Your current database version is too old to be migrated. Please see https://docs.gitlab.com/ee/policy/maintenance.html#upgrade-recommendations" - end - Rake::Task['db:migrate'].invoke else # Add post-migrate paths to ensure we mark all migrations as up diff --git a/lib/tasks/migrate/schema_check.rake b/lib/tasks/migrate/schema_check.rake new file mode 100644 index 00000000000..1f2ed2f439c --- /dev/null +++ b/lib/tasks/migrate/schema_check.rake @@ -0,0 +1,11 @@ +desc 'Configures the database by running migrate, or by loading the schema and seeding if needed' +task schema_version_check: :environment do + if ActiveRecord::Migrator.current_version < Gitlab::Database::MIN_SCHEMA_VERSION + raise "Your current database version is too old to be migrated. " \ + "You should upgrade to GitLab #{Gitlab::Database::MIN_SCHEMA_GITLAB_VERSION} before moving to this version. " \ + "Please see https://docs.gitlab.com/ee/policy/maintenance.html#upgrade-recommendations" + end +end + +# Ensure the check is a pre-requisite when running db:migrate +Rake::Task["db:migrate"].enhance [:schema_version_check] |