Add latest changes from gitlab-org/gitlab@master

5 files changed, 34 insertions, 1 deletions

diff --git a/db/migrate/20211119085015_add_orignal_filename_to_ci_job_artifact.rb b/db/migrate/20211119085015_add_orignal_filename_to_ci_job_artifact.rb
new file mode 100644
index 00000000000..f52bc346d16
--- /dev/null
+++ b/db/migrate/20211119085015_add_orignal_filename_to_ci_job_artifact.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddOrignalFilenameToCiJobArtifact < Gitlab::Database::Migration[1.0]
+  enable_lock_retries!
+
+  # rubocop:disable Migration/AddLimitToTextColumns
+  # limit is added in 20211119085036_add_text_limit_to_job_artifact_original_filename.rb
+  def up
+    add_column :ci_job_artifacts, :original_filename, :text
+  end
+  # rubocop:enable Migration/AddLimitToTextColumns
+
+  def down
+    remove_column :ci_job_artifacts, :original_filename, :text
+  end
+end
diff --git a/db/post_migrate/20211119085036_add_text_limit_to_job_artifact_original_filename.rb b/db/post_migrate/20211119085036_add_text_limit_to_job_artifact_original_filename.rb
new file mode 100644
index 00000000000..3eccbb1b3a4
--- /dev/null
+++ b/db/post_migrate/20211119085036_add_text_limit_to_job_artifact_original_filename.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddTextLimitToJobArtifactOriginalFilename < Gitlab::Database::Migration[1.0]
+  disable_ddl_transaction!
+
+  def up
+    add_text_limit :ci_job_artifacts, :original_filename, 512
+  end
+
+  def down
+    remove_text_limit :ci_job_artifacts, :original_filename
+  end
+end
diff --git a/db/schema_migrations/20211119085015 b/db/schema_migrations/20211119085015
new file mode 100644
index 00000000000..874bd158e7c
--- /dev/null
+++ b/db/schema_migrations/20211119085015
@@ -0,0 +1 @@
+88b289d724f98f75e0340cde4c6e2bc3cb55df2a979934fb2bc544d22e4c032d
\ No newline at end of file
diff --git a/db/schema_migrations/20211119085036 b/db/schema_migrations/20211119085036
new file mode 100644
index 00000000000..f9d1eeffbcb
--- /dev/null
+++ b/db/schema_migrations/20211119085036
@@ -0,0 +1 @@
+2b2c28e0370ae1bb84bee5ff769c9b313902d1f1afc50fa54e23a1627b1121f3
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index d57b66ad602..cd081495e34 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -11699,7 +11699,9 @@ CREATE TABLE ci_job_artifacts (
     id bigint NOT NULL,
     job_id bigint NOT NULL,
     locked smallint DEFAULT 2,
-    CONSTRAINT check_27f0f6dbab CHECK ((file_store IS NOT NULL))
+    original_filename text,
+    CONSTRAINT check_27f0f6dbab CHECK ((file_store IS NOT NULL)),
+    CONSTRAINT check_85573000db CHECK ((char_length(original_filename) <= 512))
 );
 
 CREATE SEQUENCE ci_job_artifacts_id_seq