summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-01-08 00:32:37 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-01-08 00:32:37 +0000
commit469a50879c1085ec77c95d650b7f135fee2c9e13 (patch)
tree0d639a63294b5abdb4e4a7bf1ed5a497d5e6869f /db
parentaa5ca44f172f02f04cca448b1f9c17d6d933de40 (diff)
downloadgitlab-ce-469a50879c1085ec77c95d650b7f135fee2c9e13.tar.gz
Add latest changes from gitlab-org/gitlab@13-7-stable-ee
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20201217111448_change_pages_deployment_size_to_bigint.rb17
-rw-r--r--db/post_migrate/20201217112249_change_pages_deployment_size_to_bigint_cleanup.rb17
-rw-r--r--db/schema_migrations/202012171114481
-rw-r--r--db/schema_migrations/202012171122491
-rw-r--r--db/structure.sql3
5 files changed, 38 insertions, 1 deletions
diff --git a/db/migrate/20201217111448_change_pages_deployment_size_to_bigint.rb b/db/migrate/20201217111448_change_pages_deployment_size_to_bigint.rb
new file mode 100644
index 00000000000..75420166b87
--- /dev/null
+++ b/db/migrate/20201217111448_change_pages_deployment_size_to_bigint.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class ChangePagesDeploymentSizeToBigint < ActiveRecord::Migration[6.0]
+ include Gitlab::Database::MigrationHelpers
+
+ DOWNTIME = false
+
+ disable_ddl_transaction!
+
+ def up
+ change_column_type_concurrently :pages_deployments, :size, :bigint
+ end
+
+ def down
+ undo_change_column_type_concurrently :pages_deployments, :size
+ end
+end
diff --git a/db/post_migrate/20201217112249_change_pages_deployment_size_to_bigint_cleanup.rb b/db/post_migrate/20201217112249_change_pages_deployment_size_to_bigint_cleanup.rb
new file mode 100644
index 00000000000..4ed29ba61f9
--- /dev/null
+++ b/db/post_migrate/20201217112249_change_pages_deployment_size_to_bigint_cleanup.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class ChangePagesDeploymentSizeToBigintCleanup < ActiveRecord::Migration[6.0]
+ include Gitlab::Database::MigrationHelpers
+
+ DOWNTIME = false
+
+ disable_ddl_transaction!
+
+ def up
+ cleanup_concurrent_column_type_change :pages_deployments, :size
+ end
+
+ def down
+ undo_cleanup_concurrent_column_type_change :pages_deployments, :size, :integer, limit: 4
+ end
+end
diff --git a/db/schema_migrations/20201217111448 b/db/schema_migrations/20201217111448
new file mode 100644
index 00000000000..02526b55a3d
--- /dev/null
+++ b/db/schema_migrations/20201217111448
@@ -0,0 +1 @@
+32330327aa8db01b5bc2c533af5387e77ad3dc0c34eacaac16a793df75634ce6 \ No newline at end of file
diff --git a/db/schema_migrations/20201217112249 b/db/schema_migrations/20201217112249
new file mode 100644
index 00000000000..b5b280bbf07
--- /dev/null
+++ b/db/schema_migrations/20201217112249
@@ -0,0 +1 @@
+938aa97919e5a15143a72f33bebb27e501d5ef7cc53cf4e7debe9dee398b7255 \ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 6380f64c64c..9bf6799dc85 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -14809,10 +14809,11 @@ CREATE TABLE pages_deployments (
project_id bigint NOT NULL,
ci_build_id bigint,
file_store smallint NOT NULL,
- size integer NOT NULL,
file text NOT NULL,
file_count integer NOT NULL,
file_sha256 bytea NOT NULL,
+ size bigint,
+ CONSTRAINT check_5f9132a958 CHECK ((size IS NOT NULL)),
CONSTRAINT check_f0fe8032dd CHECK ((char_length(file) <= 255))
);