monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2417 from ClearlyClaire/glitch-soc/merge-upstream 

Merge upstream changes
This commit is contained in:
Claire 2023-09-19 17:38:05 +02:00 committed by GitHub
parent 57f47e50f0 6a9e93ae19
commit 5efa6ac771
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb
View File

@ -18,7 +18,7 @@ class AddUniqueIndexOnPreviewCardsStatuses < ActiveRecord::Migration[6.1]
def supports_concurrent_reindex? def supports_concurrent_reindex?
@supports_concurrent_reindex ||= begin @supports_concurrent_reindex ||= begin
version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
version >= 12_000 version >= 120_000
end end
end end

2
lib/mastodon/migration_helpers.rb
View File

@ -202,7 +202,7 @@ module Mastodon
def supports_add_column_with_default? def supports_add_column_with_default?
version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
version >= 11_000 version >= 110_000
end end
# Adds a foreign key with only minimal locking on the tables involved. # Adds a foreign key with only minimal locking on the tables involved.