Add `accepted_terms` to users
This will act as a cache, otherwise we would need to load the `term_agreements` for a user on each request. Using this field the result we're interested in is loaded when the current user is loaded, without causing an extra query.
This commit is contained in:
parent
3629dc338f
commit
65bea3f7d0
|
@ -0,0 +1,23 @@
|
||||||
|
# See http://doc.gitlab.com/ce/development/migration_style_guide.html
|
||||||
|
# for more information on how to write migrations for GitLab.
|
||||||
|
|
||||||
|
class AddAcceptedTermToUsers < ActiveRecord::Migration
|
||||||
|
include Gitlab::Database::MigrationHelpers
|
||||||
|
|
||||||
|
DOWNTIME = false
|
||||||
|
|
||||||
|
disable_ddl_transaction!
|
||||||
|
|
||||||
|
def up
|
||||||
|
change_table :users do |t|
|
||||||
|
t.references :accepted_term,
|
||||||
|
null: true
|
||||||
|
end
|
||||||
|
add_concurrent_foreign_key :users, :application_setting_terms, column: :accepted_term_id
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
remove_foreign_key :users, column: :accepted_term_id
|
||||||
|
remove_column :users, :accepted_term_id
|
||||||
|
end
|
||||||
|
end
|
|
@ -2024,6 +2024,7 @@ ActiveRecord::Schema.define(version: 20180503150427) do
|
||||||
t.string "preferred_language"
|
t.string "preferred_language"
|
||||||
t.string "rss_token"
|
t.string "rss_token"
|
||||||
t.integer "theme_id", limit: 2
|
t.integer "theme_id", limit: 2
|
||||||
|
t.integer "accepted_term_id"
|
||||||
end
|
end
|
||||||
|
|
||||||
add_index "users", ["admin"], name: "index_users_on_admin", using: :btree
|
add_index "users", ["admin"], name: "index_users_on_admin", using: :btree
|
||||||
|
@ -2239,6 +2240,7 @@ ActiveRecord::Schema.define(version: 20180503150427) do
|
||||||
add_foreign_key "user_interacted_projects", "projects", name: "fk_722ceba4f7", on_delete: :cascade
|
add_foreign_key "user_interacted_projects", "projects", name: "fk_722ceba4f7", on_delete: :cascade
|
||||||
add_foreign_key "user_interacted_projects", "users", name: "fk_0894651f08", on_delete: :cascade
|
add_foreign_key "user_interacted_projects", "users", name: "fk_0894651f08", on_delete: :cascade
|
||||||
add_foreign_key "user_synced_attributes_metadata", "users", on_delete: :cascade
|
add_foreign_key "user_synced_attributes_metadata", "users", on_delete: :cascade
|
||||||
|
add_foreign_key "users", "application_setting_terms", column: "accepted_term_id", name: "fk_789cd90b35", on_delete: :cascade
|
||||||
add_foreign_key "users_star_projects", "projects", name: "fk_22cd27ddfc", on_delete: :cascade
|
add_foreign_key "users_star_projects", "projects", name: "fk_22cd27ddfc", on_delete: :cascade
|
||||||
add_foreign_key "web_hook_logs", "web_hooks", on_delete: :cascade
|
add_foreign_key "web_hook_logs", "web_hooks", on_delete: :cascade
|
||||||
add_foreign_key "web_hooks", "projects", name: "fk_0c8ca6d9d1", on_delete: :cascade
|
add_foreign_key "web_hooks", "projects", name: "fk_0c8ca6d9d1", on_delete: :cascade
|
||||||
|
|
Loading…
Reference in New Issue