diff --git a/.travis.yml b/.travis.yml index c9e8f557..2078e04f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ rvm: - 2.4.9 - 2.5.7 - 2.6.5 + - 2.7.1 before_script: - sudo service mysql stop - sudo service postgresql stop diff --git a/lib/ridgepole/delta.rb b/lib/ridgepole/delta.rb index 12145e84..a0bd896e 100644 --- a/lib/ridgepole/delta.rb +++ b/lib/ridgepole/delta.rb @@ -269,7 +269,7 @@ def append_create_table(table_name, attrs, buf, post_buf_for_fk) def append_rename_table(to_table_name, from_table_name, buf) buf.puts(<<-RUBY) -rename_table(#{from_table_name.inspect}, #{to_table_name.inspect}) +rename_table(#{from_table_name.inspect}, **#{to_table_name.inspect}) RUBY buf.puts @@ -429,11 +429,11 @@ def append_add_index(table_name, _index_name, attrs, buf, force_bulk_change = fa if force_bulk_change || @options[:bulk_change] buf.puts(<<-RUBY) - t.index(#{column_name.inspect}, #{options.inspect}) + t.index(#{column_name.inspect}, **#{options.inspect}) RUBY else buf.puts(<<-RUBY) -add_index(#{table_name.inspect}, #{column_name.inspect}, #{options.inspect}) +add_index(#{table_name.inspect}, #{column_name.inspect}, **#{options.inspect}) RUBY end end @@ -469,7 +469,7 @@ def append_add_foreign_key(table_name, attrs, buf, _options) attrs_options = attrs[:options] || {} buf.puts(<<-RUBY) -add_foreign_key(#{table_name.inspect}, #{to_table.inspect}, #{attrs_options.inspect}) +add_foreign_key(#{table_name.inspect}, #{to_table.inspect}, **#{attrs_options.inspect}) RUBY end @@ -500,17 +500,19 @@ def normalize_limit(column_type, column_options) def inspect_options_include_default_proc(options) options = options.dup - if options[:default].is_a?(Proc) - proc_default = options.delete(:default) - proc_default = ":default=>proc{#{proc_default.call.inspect}}" - options_inspect = options.inspect - options_inspect.sub!(/\}\z/, '') - options_inspect << ', ' if options_inspect !~ /\{\z/ - options_inspect << proc_default << '}' - options_inspect - else - options.inspect - end + kwargs = + if options[:default].is_a?(Proc) + proc_default = options.delete(:default) + proc_default = ":default=>proc{#{proc_default.call.inspect}}" + options_inspect = options.inspect + options_inspect.sub!(/\}\z/, '') + options_inspect << ', ' if options_inspect !~ /\{\z/ + options_inspect << proc_default << '}' + options_inspect + else + options.inspect + end + "**#{kwargs}" end end end