Convert string concatenations to substitutions
This commit is contained in:
parent
da2f61947d
commit
4a1e2c3253
@ -188,25 +188,25 @@ def indexes(table, stream)
|
||||
if (indexes = @connection.indexes(table)).any?
|
||||
add_index_statements = indexes.map do |index|
|
||||
statement_parts = [
|
||||
('add_index ' + remove_prefix_and_suffix(index.table).inspect),
|
||||
"add_index #{remove_prefix_and_suffix(index.table).inspect}",
|
||||
index.columns.inspect,
|
||||
('name: ' + index.name.inspect),
|
||||
"name: #{index.name.inspect}",
|
||||
]
|
||||
statement_parts << 'unique: true' if index.unique
|
||||
|
||||
index_lengths = (index.lengths || []).compact
|
||||
statement_parts << ('length: ' + Hash[index.columns.zip(index.lengths)].inspect) unless index_lengths.empty?
|
||||
statement_parts << "length: #{Hash[index.columns.zip(index.lengths)].inspect}" unless index_lengths.empty?
|
||||
|
||||
index_orders = (index.orders || {})
|
||||
statement_parts << ('order: ' + index.orders.inspect) unless index_orders.empty?
|
||||
statement_parts << "order: #{index.orders.inspect}" unless index_orders.empty?
|
||||
|
||||
statement_parts << ('where: ' + index.where.inspect) if index.where
|
||||
statement_parts << "where: #{index.where.inspect}" if index.where
|
||||
|
||||
statement_parts << ('using: ' + index.using.inspect) if index.using
|
||||
statement_parts << "using: #{index.using.inspect}" if index.using
|
||||
|
||||
statement_parts << ('type: ' + index.type.inspect) if index.type
|
||||
statement_parts << "type: #{index.type.inspect}" if index.type
|
||||
|
||||
' ' + statement_parts.join(', ')
|
||||
" #{statement_parts.join(', ')}"
|
||||
end
|
||||
|
||||
stream.puts add_index_statements.sort.join("\n")
|
||||
@ -218,26 +218,26 @@ def foreign_keys(table, stream)
|
||||
if (foreign_keys = @connection.foreign_keys(table)).any?
|
||||
add_foreign_key_statements = foreign_keys.map do |foreign_key|
|
||||
parts = [
|
||||
'add_foreign_key ' + remove_prefix_and_suffix(foreign_key.from_table).inspect,
|
||||
"add_foreign_key #{remove_prefix_and_suffix(foreign_key.from_table).inspect}",
|
||||
remove_prefix_and_suffix(foreign_key.to_table).inspect,
|
||||
]
|
||||
|
||||
if foreign_key.column != @connection.foreign_key_column_for(foreign_key.to_table)
|
||||
parts << ('column: ' + foreign_key.column.inspect)
|
||||
parts << "column: #{foreign_key.column.inspect}"
|
||||
end
|
||||
|
||||
if foreign_key.custom_primary_key?
|
||||
parts << ('primary_key: ' + foreign_key.primary_key.inspect)
|
||||
parts << "primary_key: #{foreign_key.primary_key.inspect}"
|
||||
end
|
||||
|
||||
if foreign_key.name !~ /^fk_rails_[0-9a-f]{10}$/
|
||||
parts << ('name: ' + foreign_key.name.inspect)
|
||||
parts << "name: #{foreign_key.name.inspect}"
|
||||
end
|
||||
|
||||
parts << ('on_update: ' + foreign_key.on_update.inspect) if foreign_key.on_update
|
||||
parts << ('on_delete: ' + foreign_key.on_delete.inspect) if foreign_key.on_delete
|
||||
parts << "on_update: #{foreign_key.on_update.inspect}" if foreign_key.on_update
|
||||
parts << "on_delete: #{foreign_key.on_delete.inspect}" if foreign_key.on_delete
|
||||
|
||||
' ' + parts.join(', ')
|
||||
" #{parts.join(', ')}"
|
||||
end
|
||||
|
||||
stream.puts add_foreign_key_statements.sort.join("\n")
|
||||
|
Loading…
Reference in New Issue
Block a user