diff --git a/app/models/project.rb b/app/models/project.rb index 3ec3bf764..4e2904731 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -13,10 +13,8 @@ class Project < ApplicationRecord belongs_to :ignore, optional: true belongs_to :license, optional: true belongs_to :owner, class_name: 'User', foreign_key: :user_id - # belongs_to :project_category, optional: true , :counter_cache => true - # belongs_to :project_language, optional: true , :counter_cache => true - belongs_to :project_category, optional: true - belongs_to :project_language, optional: true + belongs_to :project_category, optional: true , :counter_cache => true + belongs_to :project_language, optional: true , :counter_cache => true has_many :project_trends, dependent: :destroy has_many :watchers, as: :watchable, dependent: :destroy has_many :fork_users, dependent: :destroy diff --git a/db/migrate/20200525021613_add_index_for_project_language_and_category.rb b/db/migrate/20200525021613_add_index_for_project_language_and_category.rb index 9a27b005e..dbb5110ca 100644 --- a/db/migrate/20200525021613_add_index_for_project_language_and_category.rb +++ b/db/migrate/20200525021613_add_index_for_project_language_and_category.rb @@ -17,17 +17,5 @@ class AddIndexForProjectLanguageAndCategory < ActiveRecord::Migration[5.2] puts "#######____update_project_language_id____##############{k}" ProjectLanguage.update_counters(k, projects_count: v) end - - # project_categories = ProjectCategory.select(:id, :projects_count).includes(:projects) - # project_categories.each do |i| - # puts "#######____update_project_category_id____##############{i.id}" - # ProjectCategory.reset_counters(i.id, :projects) - # end - - # project_languages = ProjectLanguage.select(:id, :projects_count).includes(:projects) - # project_languages.each do |i| - # puts "#######____update_project_language_id____##############{i.id}" - # ProjectLanguage.reset_counters(i.id, :projects) - # end end end diff --git a/db/migrate/20200525054200_change_project_category_language_id_default.rb b/db/migrate/20200525054200_change_project_category_language_id_default.rb new file mode 100644 index 000000000..49717ff1a --- /dev/null +++ b/db/migrate/20200525054200_change_project_category_language_id_default.rb @@ -0,0 +1,6 @@ +class ChangeProjectCategoryLanguageIdDefault < ActiveRecord::Migration[5.2] + def change + execute "ALTER TABLE project_languages MODIFY COLUMN id INT AUTO_INCREMENT;" + execute "ALTER TABLE project_categories MODIFY COLUMN id INT AUTO_INCREMENT;" + end +end