diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-10 00:06:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-10 00:06:24 +0300 |
commit | 4b28d5ae770c6bd332283a3f13ceae06329c409b (patch) | |
tree | ae4d46e1d017002935fe75dc14cb3c108be12fae /db | |
parent | 41efffa17c67405ca5f5dac49d72be7872cee339 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20191004133612_create_analytics_repository_file_commits.rb | 19 | ||||
-rw-r--r-- | db/post_migrate/20191004134055_drop_unused_analytics_repository_file_edits.rb | 32 | ||||
-rw-r--r-- | db/schema.rb | 16 |
3 files changed, 59 insertions, 8 deletions
diff --git a/db/migrate/20191004133612_create_analytics_repository_file_commits.rb b/db/migrate/20191004133612_create_analytics_repository_file_commits.rb new file mode 100644 index 00000000000..f2064b2b301 --- /dev/null +++ b/db/migrate/20191004133612_create_analytics_repository_file_commits.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class CreateAnalyticsRepositoryFileCommits < ActiveRecord::Migration[5.2] + DOWNTIME = false + + def change + create_table :analytics_repository_file_commits do |t| + t.references :analytics_repository_file, index: { name: 'index_analytics_repository_file_commits_file_id' }, foreign_key: { on_delete: :cascade }, null: false + t.references :project, index: false, foreign_key: { on_delete: :cascade }, null: false + t.date :committed_date, null: false + t.integer :commit_count, limit: 2, null: false + end + + add_index :analytics_repository_file_commits, + [:project_id, :committed_date, :analytics_repository_file_id], + name: 'index_file_commits_on_committed_date_file_id_and_project_id', + unique: true + end +end diff --git a/db/post_migrate/20191004134055_drop_unused_analytics_repository_file_edits.rb b/db/post_migrate/20191004134055_drop_unused_analytics_repository_file_edits.rb new file mode 100644 index 00000000000..7bf92080fe6 --- /dev/null +++ b/db/post_migrate/20191004134055_drop_unused_analytics_repository_file_edits.rb @@ -0,0 +1,32 @@ +# frozen_string_literal: true + +class DropUnusedAnalyticsRepositoryFileEdits < ActiveRecord::Migration[5.2] + DOWNTIME = false + + def up + # The table was never used, there is no app code that writes or reads the table. Safe to remove. + drop_table :analytics_repository_file_edits + end + + def down + create_table :analytics_repository_file_edits do |t| + t.references :project, + index: true, + foreign_key: { on_delete: :cascade }, null: false + t.references :analytics_repository_file, + index: false, + foreign_key: { on_delete: :cascade }, + null: false + t.date :committed_date, + null: false + t.integer :num_edits, + null: false, + default: 0 + end + + add_index :analytics_repository_file_edits, + [:analytics_repository_file_id, :committed_date, :project_id], + name: 'index_file_edits_on_committed_date_file_id_and_project_id', + unique: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 3a1d5d73c89..352023ac40d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_09_30_025655) do +ActiveRecord::Schema.define(version: 2019_10_04_134055) do # These are extensions that must be enabled in order to support this database enable_extension "pg_trgm" @@ -93,13 +93,13 @@ ActiveRecord::Schema.define(version: 2019_09_30_025655) do t.index ["project_id"], name: "analytics_repository_languages_on_project_id" end - create_table "analytics_repository_file_edits", force: :cascade do |t| - t.bigint "project_id", null: false + create_table "analytics_repository_file_commits", force: :cascade do |t| t.bigint "analytics_repository_file_id", null: false + t.bigint "project_id", null: false t.date "committed_date", null: false - t.integer "num_edits", default: 0, null: false - t.index ["analytics_repository_file_id", "committed_date", "project_id"], name: "index_file_edits_on_committed_date_file_id_and_project_id", unique: true - t.index ["project_id"], name: "index_analytics_repository_file_edits_on_project_id" + t.integer "commit_count", limit: 2, null: false + t.index ["analytics_repository_file_id"], name: "index_analytics_repository_file_commits_file_id" + t.index ["project_id", "committed_date", "analytics_repository_file_id"], name: "index_file_commits_on_committed_date_file_id_and_project_id", unique: true end create_table "analytics_repository_files", force: :cascade do |t| @@ -3894,8 +3894,8 @@ ActiveRecord::Schema.define(version: 2019_09_30_025655) do add_foreign_key "analytics_cycle_analytics_project_stages", "projects", on_delete: :cascade add_foreign_key "analytics_language_trend_repository_languages", "programming_languages", on_delete: :cascade add_foreign_key "analytics_language_trend_repository_languages", "projects", on_delete: :cascade - add_foreign_key "analytics_repository_file_edits", "analytics_repository_files", on_delete: :cascade - add_foreign_key "analytics_repository_file_edits", "projects", on_delete: :cascade + add_foreign_key "analytics_repository_file_commits", "analytics_repository_files", on_delete: :cascade + add_foreign_key "analytics_repository_file_commits", "projects", on_delete: :cascade add_foreign_key "analytics_repository_files", "projects", on_delete: :cascade add_foreign_key "application_settings", "namespaces", column: "custom_project_templates_group_id", on_delete: :nullify add_foreign_key "application_settings", "projects", column: "file_template_project_id", name: "fk_ec757bd087", on_delete: :nullify |