Add latest changes from gitlab-org/gitlab@master

2 files changed, 41 insertions, 0 deletions

diff --git a/scripts/database/schema_validator.rb b/scripts/database/schema_validator.rb
new file mode 100644
index 00000000000..11a53faa945
--- /dev/null
+++ b/scripts/database/schema_validator.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require_relative '../migration_schema_validator'
+
+class SchemaValidator < MigrationSchemaValidator
+  ALLOW_SCHEMA_CHANGES = 'ALLOW_SCHEMA_CHANGES'
+  COMMIT_MESSAGE_SKIP_TAG = 'skip-db-structure-check'
+
+  def validate!
+    return if should_skip?
+
+    return if schema_changes.empty?
+
+    die "#{FILENAME} was changed, and no migrations were added:\n#{schema_changes}" if committed_migrations.empty?
+  end
+
+  private
+
+  def schema_changes
+    @schema_changes ||= run("git diff #{diff_target} HEAD -- #{FILENAME}")
+  end
+
+  def should_skip?
+    skip_env_present? || skip_commit_present?
+  end
+
+  def skip_env_present?
+    !ENV[ALLOW_SCHEMA_CHANGES].to_s.empty?
+  end
+
+  def skip_commit_present?
+    run("git show -s --format=%B -n 1").to_s.include?(COMMIT_MESSAGE_SKIP_TAG)
+  end
+end
diff --git a/scripts/validate_schema_changes b/scripts/validate_schema_changes
new file mode 100755
index 00000000000..a6a01a060ce
--- /dev/null
+++ b/scripts/validate_schema_changes
@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require_relative './database/schema_validator'
+
+SchemaValidator.new.validate!