Merge branch 'main' into glitch-soc/merge-upstream
commit
6a9e93ae19
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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.
|
||||||
|
|
Loading…
Reference in New Issue