diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-12-05 12:03:35 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-12-05 12:03:35 +0100 |
| commit | 92e8ad5247e2e2c8b6488327c9818e2d83f3a881 (patch) | |
| tree | 68e7be1196b5f9157e74c380dbe87e816a73b121 | |
| parent | e58ce2b72eec6b92986884ee80b974b83134b7f4 (diff) | |
| download | gitlab-ce-92e8ad5247e2e2c8b6488327c9818e2d83f3a881.tar.gz | |
Merge index during table creation
| -rw-r--r-- | db/migrate/20170918072948_create_job_artifacts.rb | 1 | ||||
| -rw-r--r-- | db/migrate/20171130145523_uniqueness_contraint_job_artifact_file_type.rb | 16 | ||||
| -rw-r--r-- | db/schema.rb | 2 |
3 files changed, 2 insertions, 17 deletions
diff --git a/db/migrate/20170918072948_create_job_artifacts.rb b/db/migrate/20170918072948_create_job_artifacts.rb index 304b3fce5be..95f2c6c8ce8 100644 --- a/db/migrate/20170918072948_create_job_artifacts.rb +++ b/db/migrate/20170918072948_create_job_artifacts.rb @@ -17,6 +17,7 @@ class CreateJobArtifacts < ActiveRecord::Migration t.string :file t.foreign_key :ci_builds, column: :job_id, on_delete: :cascade + t.index [:job_id, :file_type], unique: true end end end diff --git a/db/migrate/20171130145523_uniqueness_contraint_job_artifact_file_type.rb b/db/migrate/20171130145523_uniqueness_contraint_job_artifact_file_type.rb deleted file mode 100644 index 7ecbac8a81d..00000000000 --- a/db/migrate/20171130145523_uniqueness_contraint_job_artifact_file_type.rb +++ /dev/null @@ -1,16 +0,0 @@ -class UniquenessContraintJobArtifactFileType < ActiveRecord::Migration - include Gitlab::Database::MigrationHelpers - - # Set this constant to true if this migration requires downtime. - DOWNTIME = false - - disable_ddl_transaction! - - def up - add_concurrent_index :ci_job_artifacts, [:job_id, :file_type], unique: true - end - - def down - remove_concurrent_index :ci_job_artifacts, [:job_id, :file_type] - end -end diff --git a/db/schema.rb b/db/schema.rb index de84d861530..da3894c2076 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: 20171130145523) do +ActiveRecord::Schema.define(version: 20171124150326) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" |