TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Convert string concatenations to substitutions

Browse Source
This commit is contained in:
Tee Parham 2014-09-06 10:55:29 -06:00
parent da2f61947d
commit 4a1e2c3253
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
activerecord/lib/active_record/schema_dumper.rb
View File

@ -188,25 +188,25 @@ def indexes(table, stream)
if (indexes = @connection.indexes(table)).any? if (indexes = @connection.indexes(table)).any?
add_index_statements = indexes.map do |index| add_index_statements = indexes.map do |index|
statement_parts = [ statement_parts = [
('add_index ' + remove_prefix_and_suffix(index.table).inspect), "add_index #{remove_prefix_and_suffix(index.table).inspect}",
index.columns.inspect, index.columns.inspect,
('name: ' + index.name.inspect), "name: #{index.name.inspect}",
] ]
statement_parts << 'unique: true' if index.unique statement_parts << 'unique: true' if index.unique
index_lengths = (index.lengths || []).compact 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 || {}) 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 end
stream.puts add_index_statements.sort.join("\n") 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? if (foreign_keys = @connection.foreign_keys(table)).any?
add_foreign_key_statements = foreign_keys.map do |foreign_key| add_foreign_key_statements = foreign_keys.map do |foreign_key|
parts = [ 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, remove_prefix_and_suffix(foreign_key.to_table).inspect,
] ]
if foreign_key.column != @connection.foreign_key_column_for(foreign_key.to_table) 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 end
if foreign_key.custom_primary_key? if foreign_key.custom_primary_key?
parts << ('primary_key: ' + foreign_key.primary_key.inspect) parts << "primary_key: #{foreign_key.primary_key.inspect}"
end end
if foreign_key.name !~ /^fk_rails_[0-9a-f]{10}$/ if foreign_key.name !~ /^fk_rails_[0-9a-f]{10}$/
parts << ('name: ' + foreign_key.name.inspect) parts << "name: #{foreign_key.name.inspect}"
end end
parts << ('on_update: ' + foreign_key.on_update.inspect) if foreign_key.on_update 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_delete: #{foreign_key.on_delete.inspect}" if foreign_key.on_delete
' ' + parts.join(', ') " #{parts.join(', ')}"
end end
stream.puts add_foreign_key_statements.sort.join("\n") stream.puts add_foreign_key_statements.sort.join("\n")