fix the EE migrations

5 files changed, 38 insertions, 62 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
deleted file mode 100644
index 4d459ccab2c..00000000000
--- a/db/migrate/20170825015534_add_file_store_to_lfs_objects.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 up
-    add_column(:lfs_objects, :file_store, :integer)
-  end
-
-  def down
-    remove_column(:lfs_objects, :file_store)
-  end
-end
diff --git a/db/migrate/20170918072949_add_file_store_job_artifacts.rb b/db/migrate/20170918072949_add_file_store_job_artifacts.rb
deleted file mode 100644
index 8c265bb6aca..00000000000
--- a/db/migrate/20170918072949_add_file_store_job_artifacts.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class AddFileStoreJobArtifacts < ActiveRecord::Migration
-  include Gitlab::Database::MigrationHelpers
-
-  disable_ddl_transaction!
-  DOWNTIME = false
-
-  def up
-    add_column(:ci_job_artifacts, :file_store, :integer)
-  end
-
-  def down
-    remove_column(:ci_job_artifacts, :file_store)
-  end
-end
diff --git a/db/migrate/20171214144320_add_store_column_to_uploads.rb b/db/migrate/20171214144320_add_store_column_to_uploads.rb
deleted file mode 100644
index bad20dcdbcf..00000000000
--- a/db/migrate/20171214144320_add_store_column_to_uploads.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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
new file mode 100644
index 00000000000..aa1e15072b8
--- /dev/null
+++ b/db/migrate/20180222152310_port_object_storage_to_ce.rb
@@ -0,0 +1,37 @@
+# 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 up
+    unless column_exists?(:ci_job_artifacts, :file_store)
+      add_column(:ci_job_artifacts, :file_store, :integer)
+    end
+
+    unless column_exists?(:lfs_objects, :file_store)
+      add_column(:lfs_objects, :file_store, :integer)
+    end
+
+    unless column_exists?(:uploads, :store)
+      add_column(:uploads, :store, :integer)
+    end
+  end
+
+  def down
+    if column_exists?(:ci_job_artifacts, :file_store)
+      remove_column(:ci_job_artifacts, :file_store)
+    end
+
+    if column_exists?(:lfs_objects, :file_store)
+      remove_column(:lfs_objects, :file_store)
+    end
+
+    if column_exists?(:uploads, :store)
+      remove_column(:uploads, :store)
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b957a67578a..5f3a11af49b 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: 20180216121030) do
+ActiveRecord::Schema.define(version: 20180222152310) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"