From b2315f292de6fcdfeefaf6f8df0823918b1d2d58 Mon Sep 17 00:00:00 2001 From: KMY Date: Mon, 17 Feb 2025 08:44:27 +0900 Subject: [PATCH] Fix test --- ...0129144440_add_new_public_index_to_statuses.rb | 2 +- ...9144813_remove_old_public_index_to_statuses.rb | 6 +----- ...dd_new_public_index_for_kmyblue_to_statuses.rb | 9 +++++++++ ...e_old_public_index_for_original_to_statuses.rb | 15 +++++++++++++++ db/schema.rb | 2 +- lib/tasks/dangerous.rake | 2 ++ 6 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 db/post_migrate/20250216231806_add_new_public_index_for_kmyblue_to_statuses.rb create mode 100644 db/post_migrate/20250216231904_remove_old_public_index_for_original_to_statuses.rb diff --git a/db/post_migrate/20250129144440_add_new_public_index_to_statuses.rb b/db/post_migrate/20250129144440_add_new_public_index_to_statuses.rb index 18acb6831a..82cc9128b6 100644 --- a/db/post_migrate/20250129144440_add_new_public_index_to_statuses.rb +++ b/db/post_migrate/20250129144440_add_new_public_index_to_statuses.rb @@ -4,6 +4,6 @@ class AddNewPublicIndexToStatuses < ActiveRecord::Migration[8.0] disable_ddl_transaction! def change - add_index :statuses, [:id, :language, :account_id], name: :index_statuses_public_20250210, algorithm: :concurrently, order: { id: :desc }, where: 'deleted_at IS NULL AND visibility IN (0, 10, 11) AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))' # rubocop:disable Naming/VariableNumber + add_index :statuses, [:id, :language, :account_id], name: :index_statuses_public_20250129, algorithm: :concurrently, order: { id: :desc }, where: 'deleted_at IS NULL AND visibility = 0 AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))' # rubocop:disable Naming/VariableNumber end end diff --git a/db/post_migrate/20250129144813_remove_old_public_index_to_statuses.rb b/db/post_migrate/20250129144813_remove_old_public_index_to_statuses.rb index 53b711c204..306fde7449 100644 --- a/db/post_migrate/20250129144813_remove_old_public_index_to_statuses.rb +++ b/db/post_migrate/20250129144813_remove_old_public_index_to_statuses.rb @@ -1,9 +1,5 @@ # frozen_string_literal: true class RemoveOldPublicIndexToStatuses < ActiveRecord::Migration[8.0] - disable_ddl_transaction! - - def change - remove_index :statuses, [:id, :account_id], name: :index_statuses_public_20231213, algorithm: :concurrently, order: { id: :desc }, where: 'deleted_at IS NULL AND visibility IN (0, 10, 11) AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))' # rubocop:disable Naming/VariableNumber - end + def change; end end diff --git a/db/post_migrate/20250216231806_add_new_public_index_for_kmyblue_to_statuses.rb b/db/post_migrate/20250216231806_add_new_public_index_for_kmyblue_to_statuses.rb new file mode 100644 index 0000000000..f63b5242b3 --- /dev/null +++ b/db/post_migrate/20250216231806_add_new_public_index_for_kmyblue_to_statuses.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddNewPublicIndexForKmyblueToStatuses < ActiveRecord::Migration[8.0] + disable_ddl_transaction! + + def change + add_index :statuses, [:id, :language, :account_id], name: :index_statuses_public_20250210, algorithm: :concurrently, order: { id: :desc }, where: 'deleted_at IS NULL AND visibility IN (0, 10, 11) AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))' # rubocop:disable Naming/VariableNumber + end +end diff --git a/db/post_migrate/20250216231904_remove_old_public_index_for_original_to_statuses.rb b/db/post_migrate/20250216231904_remove_old_public_index_for_original_to_statuses.rb new file mode 100644 index 0000000000..2a2371b50c --- /dev/null +++ b/db/post_migrate/20250216231904_remove_old_public_index_for_original_to_statuses.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class RemoveOldPublicIndexForOriginalToStatuses < ActiveRecord::Migration[8.0] + disable_ddl_transaction! + + def up + remove_index :statuses, [:id, :account_id], if_exists: true, name: :index_statuses_public_20231213, algorithm: :concurrently, order: { id: :desc }, where: 'deleted_at IS NULL AND visibility IN (0, 10, 11) AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))' # rubocop:disable Naming/VariableNumber + remove_index :statuses, [:id, :account_id], if_exists: true, name: :index_statuses_public_20200119, algorithm: :concurrently, order: { id: :desc }, where: 'deleted_at IS NULL AND visibility = 0 AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))' # rubocop:disable Naming/VariableNumber + remove_index :statuses, [:id, :language, :account_id], name: :index_statuses_public_20250129, algorithm: :concurrently, order: { id: :desc }, where: 'deleted_at IS NULL AND visibility = 0 AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))' # rubocop:disable Naming/VariableNumber + end + + def down + add_index :statuses, [:id, :language, :account_id], name: :index_statuses_public_20250129, algorithm: :concurrently, order: { id: :desc }, where: 'deleted_at IS NULL AND visibility = 0 AND reblog_of_id IS NULL AND ((NOT reply) OR (in_reply_to_account_id = account_id))' # rubocop:disable Naming/VariableNumber + end +end diff --git a/db/schema.rb b/db/schema.rb index 236e847d6d..0980aa829e 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[8.0].define(version: 2025_01_30_232529) do +ActiveRecord::Schema[8.0].define(version: 2025_02_16_231904) do # These are extensions that must be enabled in order to support this database enable_extension "pg_catalog.plpgsql" diff --git a/lib/tasks/dangerous.rake b/lib/tasks/dangerous.rake index 21e5aee110..fbd9268271 100644 --- a/lib/tasks/dangerous.rake +++ b/lib/tasks/dangerous.rake @@ -14,6 +14,8 @@ namespace :dangerous do end target_migrations = %w( + 20250216231904 + 20250216231806 20250130232529 20250123091137 20241208232829