summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDJ Mountney <david@twkie.net>2019-06-20 07:56:46 -0700
committerDJ Mountney <david@twkie.net>2019-06-25 10:44:40 -0700
commitf4e15535198da1d5a655b6abe0afafac47219ab5 (patch)
tree11c0a29db654aae83d98de903e110f8040c5a3c4 /lib
parent7a089438fa138934b5dab7bdd575a74a1dfd03c0 (diff)
downloadgitlab-ce-f4e15535198da1d5a655b6abe0afafac47219ab5.tar.gz
Move min schema version check to db:migrate
Rather than have it checked only as part of gitlab:db:configure, we will instead have it as a pre-req for every db:migrate command
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/database.rb1
-rw-r--r--lib/tasks/gitlab/db.rake4
-rw-r--r--lib/tasks/migrate/schema_check.rake11
3 files changed, 12 insertions, 4 deletions
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb
index 5e5b79b8e99..2fd9250b3c2 100644
--- a/lib/gitlab/database.rb
+++ b/lib/gitlab/database.rb
@@ -14,6 +14,7 @@ module Gitlab
# Minimum schema version from which migrations are be supported
# Migrations before this version may have been removed
MIN_SCHEMA_VERSION = 20190506135400
+ MIN_SCHEMA_GITLAB_VERSION = '11.11.0'
def self.config
ActiveRecord::Base.configurations[Rails.env]
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]