summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-07-04 12:57:37 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-07-04 12:57:37 +0000
commit4d9a3f42f1fd3be21555e19872b7121cca65015e (patch)
tree9218831b49cb106165e01b41492981089a37de10 /db
parentecf9c145f6e4d170cd059df88743393d9e63c489 (diff)
parent0d11c4a8c7f69278bdef812374e334ad11b1cd98 (diff)
downloadgitlab-ce-4d9a3f42f1fd3be21555e19872b7121cca65015e.tar.gz
Merge branch 'ee-5481-epic-todos' into 'master'
Port of Todos for epics See merge request gitlab-org/gitlab-ce!19908
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20180608091413_add_group_to_todos.rb32
-rw-r--r--db/schema.rb5
2 files changed, 36 insertions, 1 deletions
diff --git a/db/migrate/20180608091413_add_group_to_todos.rb b/db/migrate/20180608091413_add_group_to_todos.rb
new file mode 100644
index 00000000000..af3ee48b29d
--- /dev/null
+++ b/db/migrate/20180608091413_add_group_to_todos.rb
@@ -0,0 +1,32 @@
+class AddGroupToTodos < ActiveRecord::Migration
+ include Gitlab::Database::MigrationHelpers
+
+ DOWNTIME = false
+
+ disable_ddl_transaction!
+
+ def up
+ add_column :todos, :group_id, :integer
+ add_concurrent_foreign_key :todos, :namespaces, column: :group_id, on_delete: :cascade
+ add_concurrent_index :todos, :group_id
+
+ change_column_null :todos, :project_id, true
+ end
+
+ def down
+ return unless group_id_exists?
+
+ remove_foreign_key :todos, column: :group_id
+ remove_index :todos, :group_id if index_exists?(:todos, :group_id)
+ remove_column :todos, :group_id
+
+ execute "DELETE FROM todos WHERE project_id IS NULL"
+ change_column_null :todos, :project_id, false
+ end
+
+ private
+
+ def group_id_exists?
+ column_exists?(:todos, :group_id)
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5d917abdbb5..9a4e3fe5555 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1930,7 +1930,7 @@ ActiveRecord::Schema.define(version: 20180629191052) do
create_table "todos", force: :cascade do |t|
t.integer "user_id", null: false
- t.integer "project_id", null: false
+ t.integer "project_id"
t.integer "target_id"
t.string "target_type", null: false
t.integer "author_id", null: false
@@ -1940,10 +1940,12 @@ ActiveRecord::Schema.define(version: 20180629191052) do
t.datetime "updated_at"
t.integer "note_id"
t.string "commit_id"
+ t.integer "group_id"
end
add_index "todos", ["author_id"], name: "index_todos_on_author_id", using: :btree
add_index "todos", ["commit_id"], name: "index_todos_on_commit_id", using: :btree
+ add_index "todos", ["group_id"], name: "index_todos_on_group_id", using: :btree
add_index "todos", ["note_id"], name: "index_todos_on_note_id", using: :btree
add_index "todos", ["project_id"], name: "index_todos_on_project_id", using: :btree
add_index "todos", ["target_type", "target_id"], name: "index_todos_on_target_type_and_target_id", using: :btree
@@ -2315,6 +2317,7 @@ ActiveRecord::Schema.define(version: 20180629191052) do
add_foreign_key "term_agreements", "users", on_delete: :cascade
add_foreign_key "timelogs", "issues", name: "fk_timelogs_issues_issue_id", on_delete: :cascade
add_foreign_key "timelogs", "merge_requests", name: "fk_timelogs_merge_requests_merge_request_id", on_delete: :cascade
+ add_foreign_key "todos", "namespaces", column: "group_id", on_delete: :cascade
add_foreign_key "todos", "notes", name: "fk_91d1f47b13", on_delete: :cascade
add_foreign_key "todos", "projects", name: "fk_45054f9c45", on_delete: :cascade
add_foreign_key "todos", "users", column: "author_id", name: "fk_ccf0373936", on_delete: :cascade