Fix older migrations on Ruby 3 (#16174)

This commit is contained in:
Claire 2021-05-07 15:56:45 +02:00 committed by GitHub
parent 0ad240cb6b
commit a5f91a11d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 8 deletions

View file

@ -10,6 +10,7 @@ require_relative '../lib/exceptions'
require_relative '../lib/enumerable' require_relative '../lib/enumerable'
require_relative '../lib/sanitize_ext/sanitize_config' require_relative '../lib/sanitize_ext/sanitize_config'
require_relative '../lib/redis/namespace_extensions' require_relative '../lib/redis/namespace_extensions'
require_relative '../lib/paperclip/schema_extensions'
require_relative '../lib/paperclip/validation_extensions' require_relative '../lib/paperclip/validation_extensions'
require_relative '../lib/paperclip/url_generator_extensions' require_relative '../lib/paperclip/url_generator_extensions'
require_relative '../lib/paperclip/attachment_extensions' require_relative '../lib/paperclip/attachment_extensions'

View file

@ -95,7 +95,7 @@ module Mastodon
allow_null: options[:null] allow_null: options[:null]
) )
else else
add_column(table_name, column_name, :datetime_with_timezone, options) add_column(table_name, column_name, :datetime_with_timezone, **options)
end end
end end
end end
@ -120,7 +120,7 @@ module Mastodon
options = options.merge({ algorithm: :concurrently }) options = options.merge({ algorithm: :concurrently })
disable_statement_timeout disable_statement_timeout
add_index(table_name, column_name, options) add_index(table_name, column_name, **options)
end end
# Removes an existed index, concurrently when supported # Removes an existed index, concurrently when supported
@ -144,7 +144,7 @@ module Mastodon
disable_statement_timeout disable_statement_timeout
end end
remove_index(table_name, options.merge({ column: column_name })) remove_index(table_name, **options.merge({ column: column_name }))
end end
# Removes an existing index, concurrently when supported # Removes an existing index, concurrently when supported
@ -168,7 +168,7 @@ module Mastodon
disable_statement_timeout disable_statement_timeout
end end
remove_index(table_name, options.merge({ name: index_name })) remove_index(table_name, **options.merge({ name: index_name }))
end end
# Only available on Postgresql >= 9.2 # Only available on Postgresql >= 9.2
@ -472,7 +472,7 @@ module Mastodon
col_opts[:limit] = old_col.limit col_opts[:limit] = old_col.limit
end end
add_column(table, new, new_type, col_opts) add_column(table, new, new_type, **col_opts)
# We set the default value _after_ adding the column so we don't end up # We set the default value _after_ adding the column so we don't end up
# updating any existing data with the default value. This isn't # updating any existing data with the default value. This isn't
@ -510,10 +510,10 @@ module Mastodon
new_pk_index_name = "index_#{table}_on_#{column}_cm" new_pk_index_name = "index_#{table}_on_#{column}_cm"
unless indexes_for(table, column).find{|i| i.name == old_pk_index_name} unless indexes_for(table, column).find{|i| i.name == old_pk_index_name}
add_concurrent_index(table, [temp_column], { add_concurrent_index(table, [temp_column],
unique: true, unique: true,
name: new_pk_index_name name: new_pk_index_name
}) )
end end
end end
end end
@ -763,7 +763,7 @@ module Mastodon
options[:using] = index.using if index.using options[:using] = index.using if index.using
options[:where] = index.where if index.where options[:where] = index.where if index.where
add_concurrent_index(table, new_columns, options) add_concurrent_index(table, new_columns, **options)
end end
end end

View file

@ -0,0 +1,37 @@
# frozen_string_literal: true
# Monkey-patch various Paperclip methods for Ruby 3.0 compatibility
module Paperclip
module Schema
module StatementsExtensions
def add_attachment(table_name, *attachment_names)
raise ArgumentError, 'Please specify attachment name in your add_attachment call in your migration.' if attachment_names.empty?
options = attachment_names.extract_options!
attachment_names.each do |attachment_name|
COLUMNS.each_pair do |column_name, column_type|
column_options = options.merge(options[column_name.to_sym] || {})
add_column(table_name, "#{attachment_name}_#{column_name}", column_type, **column_options)
end
end
end
end
module TableDefinitionExtensions
def attachment(*attachment_names)
options = attachment_names.extract_options!
attachment_names.each do |attachment_name|
COLUMNS.each_pair do |column_name, column_type|
column_options = options.merge(options[column_name.to_sym] || {})
column("#{attachment_name}_#{column_name}", column_type, **column_options)
end
end
end
end
end
end
Paperclip::Schema::Statements.prepend(Paperclip::Schema::StatementsExtensions)
Paperclip::Schema::TableDefinition.prepend(Paperclip::Schema::TableDefinitionExtensions)