Add latest changes from gitlab-org/gitlab@master

5 files changed, 26 insertions, 2 deletions

diff --git a/db/post_migrate/20230406041555_allow_null_file_md5_to_debian_project_component_files.rb b/db/post_migrate/20230406041555_allow_null_file_md5_to_debian_project_component_files.rb
new file mode 100644
index 00000000000..d03f68e22ab
--- /dev/null
+++ b/db/post_migrate/20230406041555_allow_null_file_md5_to_debian_project_component_files.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AllowNullFileMd5ToDebianProjectComponentFiles < Gitlab::Database::Migration[2.1]
+  def up
+    change_column_null :packages_debian_project_component_files, :file_md5, true
+  end
+
+  def down
+    # There may now be nulls in the table, so we cannot re-add the constraint here.
+  end
+end
diff --git a/db/post_migrate/20230406041629_allow_null_file_md5_to_debian_group_component_files.rb b/db/post_migrate/20230406041629_allow_null_file_md5_to_debian_group_component_files.rb
new file mode 100644
index 00000000000..15e8414f0bd
--- /dev/null
+++ b/db/post_migrate/20230406041629_allow_null_file_md5_to_debian_group_component_files.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AllowNullFileMd5ToDebianGroupComponentFiles < Gitlab::Database::Migration[2.1]
+  def up
+    change_column_null :packages_debian_group_component_files, :file_md5, true
+  end
+
+  def down
+    # There may now be nulls in the table, so we cannot re-add the constraint here.
+  end
+end
diff --git a/db/schema_migrations/20230406041555 b/db/schema_migrations/20230406041555
new file mode 100644
index 00000000000..cede3b1d25e
--- /dev/null
+++ b/db/schema_migrations/20230406041555
@@ -0,0 +1 @@
+75a2776017e8d2c015021ca056c09d2b5f7776f6443c59d1bd164519575c05ba
\ No newline at end of file
diff --git a/db/schema_migrations/20230406041629 b/db/schema_migrations/20230406041629
new file mode 100644
index 00000000000..0d77ae52a24
--- /dev/null
+++ b/db/schema_migrations/20230406041629
@@ -0,0 +1 @@
+e1726eb5b20b230f4b37ef56e0f3dd512bdcea3e67a9ba5a1725363bb17b79e6
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 1fe90c6f031..d5d04ff6878 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -19276,7 +19276,7 @@ CREATE TABLE packages_debian_group_component_files (
     compression_type smallint,
     file_store smallint DEFAULT 1 NOT NULL,
     file text NOT NULL,
-    file_md5 bytea NOT NULL,
+    file_md5 bytea,
     file_sha256 bytea NOT NULL,
     CONSTRAINT check_839e1685bc CHECK ((char_length(file) <= 255))
 );
@@ -19401,7 +19401,7 @@ CREATE TABLE packages_debian_project_component_files (
     compression_type smallint,
     file_store smallint DEFAULT 1 NOT NULL,
     file text NOT NULL,
-    file_md5 bytea NOT NULL,
+    file_md5 bytea,
     file_sha256 bytea NOT NULL,
     CONSTRAINT check_e5af03fa2d CHECK ((char_length(file) <= 255))
 );