summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorMicaël Bergeron <mbergeron@gitlab.com>2018-02-27 14:17:42 -0500
committerMicaël Bergeron <mbergeron@gitlab.com>2018-03-01 10:40:40 -0500
commita3e46d9b68ebe2b4c78425fa3a77ebcb3133eef0 (patch)
tree346e047efbdb21194f6cb79df70bc328950e4f4e /db
parent40a3b467f25df62fab4b92a3700846f06ef7534c (diff)
downloadgitlab-ce-a3e46d9b68ebe2b4c78425fa3a77ebcb3133eef0.tar.gz
rework the migration to use the EE ones
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20170825015534_add_file_store_to_lfs_objects.rb31
-rw-r--r--db/migrate/20170918072949_add_file_store_job_artifacts.rb10
-rw-r--r--db/migrate/20171214144320_add_store_column_to_uploads.rb12
-rw-r--r--db/migrate/20180222152310_port_object_storage_to_ce.rb37
-rw-r--r--db/schema.rb2
5 files changed, 54 insertions, 38 deletions
diff --git a/db/migrate/20170825015534_add_file_store_to_lfs_objects.rb b/db/migrate/20170825015534_add_file_store_to_lfs_objects.rb
new file mode 100644
index 00000000000..41bb031014f
--- /dev/null
+++ b/db/migrate/20170825015534_add_file_store_to_lfs_objects.rb
@@ -0,0 +1,31 @@
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddFileStoreToLfsObjects < ActiveRecord::Migration
+ include Gitlab::Database::MigrationHelpers
+
+ # Set this constant to true if this migration requires downtime.
+ DOWNTIME = false
+
+ # When a migration requires downtime you **must** uncomment the following
+ # constant and define a short and easy to understand explanation as to why the
+ # migration requires downtime.
+ # DOWNTIME_REASON = ''
+
+ # When using the methods "add_concurrent_index", "remove_concurrent_index" or
+ # "add_column_with_default" you must disable the use of transactions
+ # as these methods can not run in an existing transaction.
+ # When using "add_concurrent_index" or "remove_concurrent_index" methods make sure
+ # that either of them is the _only_ method called in the migration,
+ # any other changes should go in a separate migration.
+ # This ensures that upon failure _only_ the index creation or removing fails
+ # and can be retried or reverted easily.
+ #
+ # To disable transactions uncomment the following line and remove these
+ # comments:
+ # disable_ddl_transaction!
+
+ def change
+ add_column(:lfs_objects, :file_store, :integer)
+ end
+end
diff --git a/db/migrate/20170918072949_add_file_store_job_artifacts.rb b/db/migrate/20170918072949_add_file_store_job_artifacts.rb
new file mode 100644
index 00000000000..b1f1bea6deb
--- /dev/null
+++ b/db/migrate/20170918072949_add_file_store_job_artifacts.rb
@@ -0,0 +1,10 @@
+class AddFileStoreJobArtifacts < ActiveRecord::Migration
+ include Gitlab::Database::MigrationHelpers
+
+ disable_ddl_transaction!
+ DOWNTIME = false
+
+ def change
+ add_column(:ci_job_artifacts, :file_store, :integer)
+ end
+end
diff --git a/db/migrate/20171214144320_add_store_column_to_uploads.rb b/db/migrate/20171214144320_add_store_column_to_uploads.rb
new file mode 100644
index 00000000000..e35798e2c41
--- /dev/null
+++ b/db/migrate/20171214144320_add_store_column_to_uploads.rb
@@ -0,0 +1,12 @@
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddStoreColumnToUploads < ActiveRecord::Migration
+ include Gitlab::Database::MigrationHelpers
+
+ DOWNTIME = false
+
+ def change
+ add_column(:uploads, :store, :integer)
+ end
+end
diff --git a/db/migrate/20180222152310_port_object_storage_to_ce.rb b/db/migrate/20180222152310_port_object_storage_to_ce.rb
deleted file mode 100644
index f2e2e53ed8c..00000000000
--- a/db/migrate/20180222152310_port_object_storage_to_ce.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# See http://doc.gitlab.com/ce/development/migration_style_guide.html
-# for more information on how to write migrations for GitLab.
-
-class PortObjectStorageToCe < ActiveRecord::Migration
- include Gitlab::Database::MigrationHelpers
-
- # Set this constant to true if this migration requires downtime.
- DOWNTIME = false
-
- def add_column_idempotent(table, column, *defs)
- return if column_exists?(table, column)
-
- add_column(table, column, *defs)
- end
-
- def remove_column_idempotent(table, column)
- return unless column_exists?(table, column)
-
- remove_column(table, column)
- end
-
- def up
- add_column_idempotent(:ci_job_artifacts, :file_store, :integer)
- add_column_idempotent(:ci_builds, :artifacts_file_store, :integer)
- add_column_idempotent(:ci_builds, :artifacts_metadata_store, :integer)
- add_column_idempotent(:lfs_objects, :file_store, :integer)
- add_column_idempotent(:uploads, :store, :integer)
- end
-
- def down
- remove_column_idempotent(:ci_job_artifacts, :file_store)
- remove_column_idempotent(:ci_builds, :artifacts_file_store)
- remove_column_idempotent(:ci_builds, :artifacts_metadata_store)
- remove_column_idempotent(:lfs_objects, :file_store)
- remove_column_idempotent(:uploads, :store)
- end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 3af701d0ed9..46f2558e7ca 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20180222152310) do
+ActiveRecord::Schema.define(version: 20180213131630) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"