diff options
| author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-01-30 08:15:34 -0500 |
|---|---|---|
| committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-02-01 12:14:46 -0500 |
| commit | e3d32e8a2689bba9497d22fa6da1d9946df67f27 (patch) | |
| tree | fd988cc1458134c3a7e8dba0b8ab4ef1522bf627 /db | |
| parent | 2057a6acdee7c1f6824ff6289b0d979e8cb15f35 (diff) | |
| download | gitlab-ce-e3d32e8a2689bba9497d22fa6da1d9946df67f27.tar.gz | |
fix specs
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20180119135717_add_uploader_index_to_uploads.rb | 4 | ||||
| -rw-r--r-- | db/schema.rb | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/db/migrate/20180119135717_add_uploader_index_to_uploads.rb b/db/migrate/20180119135717_add_uploader_index_to_uploads.rb index a678c3d049f..7fedfaa5d7d 100644 --- a/db/migrate/20180119135717_add_uploader_index_to_uploads.rb +++ b/db/migrate/20180119135717_add_uploader_index_to_uploads.rb @@ -9,12 +9,12 @@ class AddUploaderIndexToUploads < ActiveRecord::Migration disable_ddl_transaction! def up - remove_concurrent_index :uploads, :path + remove_concurrent_index :uploads, :path if index_exists? :uploads, :path add_concurrent_index :uploads, [:uploader, :path], using: :btree end def down - remove_concurrent_index :uploads, [:uploader, :path] + remove_concurrent_index :uploads, [:uploader, :path] if index_exists? :uploads, [:uploads, :path] add_concurrent_index :uploads, :path, using: :btree end end diff --git a/db/schema.rb b/db/schema.rb index 4e82a688725..7e632fe2174 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: 20180115201419) do +ActiveRecord::Schema.define(version: 20180129193323) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -1751,11 +1751,13 @@ ActiveRecord::Schema.define(version: 20180115201419) do t.string "model_type" t.string "uploader", null: false t.datetime "created_at", null: false + t.string "mount_point" + t.string "secret" end add_index "uploads", ["checksum"], name: "index_uploads_on_checksum", using: :btree add_index "uploads", ["model_id", "model_type"], name: "index_uploads_on_model_id_and_model_type", using: :btree - add_index "uploads", ["path"], name: "index_uploads_on_path", using: :btree + add_index "uploads", ["uploader", "path"], name: "index_uploads_on_uploader_and_path", using: :btree create_table "user_agent_details", force: :cascade do |t| t.string "user_agent", null: false |