ridgepole 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1663947686d2cff34fc79b5f06e6b9df2568b6c52f4e37be19a55dd3881f02f6
-  data.tar.gz: '0656469c72c0085c89fbdf29e180da8dca898e3a1d80d415cb0e3b2f03fb808f'
+  metadata.gz: 9c506e7bf27fec2d935daf79fae7e9b653dd3b65114633e401b8683755e9ca7a
+  data.tar.gz: a4615e7fe4fa35628471d512fc70fd969774ef1c8270e0ad161eb58772207dac
 SHA512:
-  metadata.gz: da61fdbb7da55e9dd9d8fb7333f267292183397dc6454b246c3b6e5ba20b452213db281ad82a23547b814ede7b3f22aa5c9b1c3800b6357dd44ef4c038bf99a0
-  data.tar.gz: 28c19d1c188746f28be8ea271193946eb9f19107adb81a92cf461af416b661df5babe75ed06a74234368fdd24b18f914ec0bdf3ff8b0e4b5b145fbd186f572bb
+  metadata.gz: 67459d1042f159bbe4345335d12029470cfb272cf75bba8ebfa7b2de05234e3fd0adba87c303817f927567654676db93efc0e8563ec9e47745b6f3c906c4d241
+  data.tar.gz: 4713c918e439078a179a185c148606d14e4c526261b4094d1417277cd471b30cdf2b3b4f0c7bca66c7e73637f1125ce3296b9cac4d55f38873d9b16d3527fd65

data/.rubocop.yml

@@ -41,3 +41,37 @@ Layout/ClosingHeredocIndentation:
   Enabled: false
 Style/NumericPredicate:
   Enabled: false
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Style/AccessorGrouping:
+  Enabled: true
+Style/BisectedAttrAccessor:
+  Enabled: true
+Style/ExponentialNotation:
+  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+Style/RedundantAssignment:
+  Enabled: true
+Style/RedundantFetchBlock:
+  Enabled: true
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+Style/RedundantRegexpEscape:
+  Enabled: true
+Style/SlicingWithRange:
+  Enabled: true

data/.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

data/README.md

@@ -115,6 +115,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Support multiple databases feature ([pull#297](https://github.com/winebarrel/ridgepole/pull/297))
 * `>= 0.8.7`
   * Support `require_relative` ([pull#298](https://github.com/winebarrel/ridgepole/pull/298))
+* `>= 0.8.8`
+  * Fix keyword arguments warnings in Ruby 2.7 ([pull#303](https://github.com/winebarrel/ridgepole/pull/303))
 </details>
 
 ## Installation
@@ -193,6 +195,7 @@ Usage: ridgepole [options]
         --ignore-table-comment
         --skip-column-comment-change
         --create-table-with-index
+        --allow-pk-change
         --mysql-dump-auto-increment
     -r, --require LIBS
         --log-file LOG_FILE
@@ -309,7 +312,6 @@ end
 ```
 
 ## Collation/Charset
-You can use the column collation by passing `--enable-mysql-awesome` ([activerecord-mysql-awesome](https://github.com/kamipo/activerecord-mysql-awesome) is required)
 
 ```ruby
 create_table "articles", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|

data/lib/ridgepole/delta.rb

@@ -326,7 +326,7 @@ execute "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(table_name
     end
 
     def append_change_table(table_name, buf)
-      buf.puts "change_table(#{table_name.inspect}, {:bulk => true}) do |t|" if @options[:bulk_change]
+      buf.puts "change_table(#{table_name.inspect}, bulk: true) do |t|" if @options[:bulk_change]
       yield
       buf.puts 'end' if @options[:bulk_change]
     end
@@ -429,11 +429,11 @@ remove_column(#{table_name.inspect}, #{column_name.inspect})
 
       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
@@ -441,15 +441,20 @@ add_index(#{table_name.inspect}, #{column_name.inspect}, #{options.inspect})
     def append_remove_index(table_name, _index_name, attrs, buf)
       column_name = attrs.fetch(:column_name)
       options = attrs[:options] || {}
-      target = options[:name] ? { name: options[:name] } : column_name
+      target =
+        if options[:name]
+          "name: #{options[:name].inspect}"
+        else
+          column_name.inspect
+        end
 
       if @options[:bulk_change]
         buf.puts(<<-RUBY)
-  t.remove_index(#{target.inspect})
+  t.remove_index(#{target})
       RUBY
       else
         buf.puts(<<-RUBY)
-remove_index(#{table_name.inspect}, #{target.inspect})
+remove_index(#{table_name.inspect}, #{target})
       RUBY
       end
     end
@@ -469,7 +474,7 @@ remove_index(#{table_name.inspect}, #{target.inspect})
       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
 
@@ -478,13 +483,13 @@ add_foreign_key(#{table_name.inspect}, #{to_table.inspect}, #{attrs_options.insp
       fk_name = attrs_options[:name]
 
       target = if fk_name
-                 { name: fk_name }
+                 "name: #{fk_name.inspect}"
                else
-                 attrs.fetch(:to_table)
+                 attrs.fetch(:to_table).inspect
                end
 
       buf.puts(<<-RUBY)
-remove_foreign_key(#{table_name.inspect}, #{target.inspect})
+remove_foreign_key(#{table_name.inspect}, #{target})
     RUBY
     end
 
@@ -500,17 +505,19 @@ remove_foreign_key(#{table_name.inspect}, #{target.inspect})
     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

data/lib/ridgepole/dsl_parser/context.rb

@@ -3,8 +3,7 @@
 module Ridgepole
   class DSLParser
     class Context
-      attr_reader :__definition
-      attr_reader :__execute
+      attr_reader :__definition, :__execute
 
       def initialize(opts = {})
         @__working_dir = File.expand_path(opts[:path] ? File.dirname(opts[:path]) : Dir.pwd)

data/lib/ridgepole/external_sql_executer.rb

@@ -41,7 +41,7 @@ module Ridgepole
               end
             end
           end
-        rescue EOFError # rubocop:disable Lint/SuppressedException
+        rescue EOFError
           # nothing to do
         end
 

data/lib/ridgepole/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ridgepole
-  VERSION = '0.8.7'
+  VERSION = '0.8.8'
 end

data/spec/mysql/collation/collation_spec.rb

@@ -138,6 +138,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
           opts = ['--dump-without-table-options']
           out, status = run_ridgepole('--diff', "'#{JSON.dump(conn_spec)}'", f.path, *opts)
 
+          # v6.0.3 is the oldest version that doesn't produce any kwargs warnings with Ruby 2.7
+          if condition('< 6.0.3')
+            # https://github.com/jeremyevans/ruby-warning/blob/1.1.0/lib/warning.rb#L18
+            out = out.lines.grep_v(/: warning: (?:Using the last argument (?:for `.+' )?as keyword parameters is deprecated; maybe \*\* should be added to the call|Passing the keyword argument (?:for `.+' )?as the last hash parameter is deprecated|Splitting the last argument (?:for `.+' )?into positional and keyword parameters is deprecated|The called method (?:`.+' )?is defined here)\n\z/).join('')
+          end
+
           expect(out).to be_empty
           expect(status.success?).to be_truthy
         end

data/spec/mysql/diff/diff2_spec.rb

@@ -175,10 +175,10 @@ describe 'Ridgepole::Client.diff' do
       delta = subject.diff(actual_dsl, expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to match_ruby erbh(<<-ERB)
-        change_column("employee_clubs", "club_id", :integer, <%= {:unsigned=>false, :null=>true, :default=>nil} + cond('>= 5.1', comment: nil) %>)
+        change_column("employee_clubs", "club_id", :integer, **<%= {:unsigned=>false, :null=>true, :default=>nil} + cond('>= 5.1', comment: nil) %>)
 
-        change_column("employees", "last_name", :string, <%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
-        change_column("employees", "gender", :string, <%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
+        change_column("employees", "last_name", :string, **<%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
+        change_column("employees", "gender", :string, **<%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
       ERB
     }
 

data/spec/mysql/diff/diff_spec.rb

@@ -149,10 +149,10 @@ describe 'Ridgepole::Client.diff' do
       delta = subject.diff(actual_dsl, expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to match_ruby erbh(<<-ERB)
-        change_column("employee_clubs", "club_id", :integer, <%= {:unsigned=>false, :null=>true, :default=>nil} + cond('>= 5.1', comment: nil) %>)
+        change_column("employee_clubs", "club_id", :integer, **<%= {:unsigned=>false, :null=>true, :default=>nil} + cond('>= 5.1', comment: nil) %>)
 
-        change_column("employees", "last_name", :string, <%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
-        change_column("employees", "gender", :string, <%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
+        change_column("employees", "last_name", :string, **<%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
+        change_column("employees", "gender", :string, **<%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
       ERB
     }
   end

data/spec/mysql/fk/migrate_create_fk_spec.rb

@@ -36,7 +36,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        add_foreign_key("child", "parent", {:name=>"child_ibfk_1"})
+        add_foreign_key("child", "parent", **{:name=>"child_ibfk_1"})
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl
@@ -144,7 +144,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        add_foreign_key("child", "parent", {})
+        add_foreign_key("child", "parent", **{})
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

data/spec/mysql/fk/migrate_drop_fk_spec.rb

@@ -50,7 +50,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy sorted_actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        remove_foreign_key("child", {:name=>"child_ibfk_1"})
+        remove_foreign_key("child", name: "child_ibfk_1")
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

data/spec/mysql/fk/migrate_fk_with_column_spec.rb

@@ -44,8 +44,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        add_foreign_key("direct_messages", "users", {:column=>"reciever_id"})
-        add_foreign_key("direct_messages", "users", {:column=>"sender_id"})
+        add_foreign_key("direct_messages", "users", **{:column=>"reciever_id"})
+        add_foreign_key("direct_messages", "users", **{:column=>"sender_id"})
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

data/spec/mysql/migrate/migrate_add_column_spec.rb

@@ -145,13 +145,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy erbh(<<-ERB)
-        change_table("employee_clubs", {:bulk=>true}) do |t|
-          t.column("any_col", :string, {:null=>false, :after=>"club_id", :limit=>255})
+        change_table("employee_clubs", bulk: true) do |t|
+          t.column("any_col", :string, **{:null=>false, :after=>"club_id", :limit=>255})
         end
 
-        change_table("employees", {:bulk => true}) do |t|
-          t.column("age", :integer, {:null=>false, :after=>"hire_date", :limit=>4})
-          t.column("updated_at", :date, {:after=>"age"})
+        change_table("employees", bulk: true) do |t|
+          t.column("age", :integer, **{:null=>false, :after=>"hire_date", :limit=>4})
+          t.column("updated_at", :date, **{:after=>"age"})
         end
       ERB
       delta.migrate

data/spec/mysql/migrate/migrate_change_column_spec.rb

@@ -142,13 +142,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy erbh(<<-ERB)
-        change_table("employee_clubs", {:bulk => true}) do |t|
-          t.change("club_id", :integer, <%= {:null=>true, :default=>nil, :unsigned=>false} + cond('>= 5.1',comment: nil) %>)
+        change_table("employee_clubs", bulk: true) do |t|
+          t.change("club_id", :integer, **<%= {:null=>true, :default=>nil, :unsigned=>false} + cond('>= 5.1',comment: nil) %>)
         end
 
-        change_table("employees", {:bulk => true}) do |t|
-          t.change("last_name", :string, <%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond('>= 5.1',comment: nil) %>)
-          t.change("gender", :string, <%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond('>= 5.1',comment: nil) %>)
+        change_table("employees", bulk: true) do |t|
+          t.change("last_name", :string, **<%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond('>= 5.1',comment: nil) %>)
+          t.change("gender", :string, **<%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond('>= 5.1',comment: nil) %>)
         end
       ERB
       delta.migrate

data/spec/mysql/migrate/migrate_change_index_spec.rb

@@ -204,19 +204,19 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        change_table("dept_emp", {:bulk => true}) do |t|
-          t.remove_index({:name=>"emp_no"})
-          t.index(["from_date"], {:name=>"emp_no", :using=>:btree, :unique=>false})
+        change_table("dept_emp", bulk: true) do |t|
+          t.remove_index(name: "emp_no")
+          t.index(["from_date"], **{:name=>"emp_no", :using=>:btree, :unique=>false})
         end
 
-        change_table("dept_manager", {:bulk => true}) do |t|
-          t.remove_index({:name=>"emp_no"})
-          t.index(["from_date"], {:name=>"emp_no", :using=>:btree, :unique=>false})
+        change_table("dept_manager", bulk: true) do |t|
+          t.remove_index(name: "emp_no")
+          t.index(["from_date"], **{:name=>"emp_no", :using=>:btree, :unique=>false})
         end
 
-        change_table("salaries", {:bulk => true}) do |t|
-          t.remove_index({:name=>"emp_no"})
-          t.index(["from_date"], {:name=>"emp_no", :using=>:btree, :unique=>false})
+        change_table("salaries", bulk: true) do |t|
+          t.remove_index(name: "emp_no")
+          t.index(["from_date"], **{:name=>"emp_no", :using=>:btree, :unique=>false})
         end
       RUBY
 

data/spec/mysql/migrate/migrate_create_index_spec.rb

@@ -141,16 +141,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy erbh(<<-ERB)
-        change_table("clubs", {:bulk => true}) do |t|
-          t.index(["name"], <%= {:name=>"idx_name", :unique=>true} + cond(5.0, using: :btree) %>)
+        change_table("clubs", bulk: true) do |t|
+          t.index(["name"], **<%= {:name=>"idx_name", :unique=>true} + cond(5.0, using: :btree) %>)
         end
 
-        change_table("employee_clubs", {:bulk => true}) do |t|
-          t.index(["emp_no", "club_id"], <%= {:name=>"idx_emp_no_club_id"} + cond(5.0, using: :btree) %>)
+        change_table("employee_clubs", bulk: true) do |t|
+          t.index(["emp_no", "club_id"], **<%= {:name=>"idx_emp_no_club_id"} + cond(5.0, using: :btree) %>)
         end
 
-        change_table("titles", {:bulk => true}) do |t|
-          t.index(["emp_no"], <%= {:name=>"emp_no"} + cond(5.0, using: :btree) %>)
+        change_table("titles", bulk: true) do |t|
+          t.index(["emp_no"], **<%= {:name=>"emp_no"} + cond(5.0, using: :btree) %>)
         end
       ERB
       delta.migrate

data/spec/mysql/migrate/migrate_create_table_with_index_spec.rb

@@ -25,13 +25,13 @@ describe 'Ridgepole::Client#diff -> migrate (with index)' do
       expect(delta.differ?).to be_truthy
 
       expect(delta.script).to match_fuzzy erbh(<<-ERB)
-        create_table("dept_emp", {:primary_key=>["emp_no", "dept_no"]}) do |t|
-          t.column("emp_no", :"integer", {:null=>false, :limit=>4})
-          t.column("dept_no", :"string", {:null=>false, :limit=>255})
-          t.column("from_date", :"date", {:null=>false})
-          t.column("to_date", :"date", {:null=>false})
-          t.index(["dept_no"], <%= {:name=>"dept_no"} + cond(5.0, using: :btree) %>)
-          t.index(["emp_no"], <%= {:name=>"emp_no"} + cond(5.0, using: :btree) %>)
+        create_table("dept_emp", **{:primary_key=>["emp_no", "dept_no"]}) do |t|
+          t.column("emp_no", :"integer", **{:null=>false, :limit=>4})
+          t.column("dept_no", :"string", **{:null=>false, :limit=>255})
+          t.column("from_date", :"date", **{:null=>false})
+          t.column("to_date", :"date", **{:null=>false})
+          t.index(["dept_no"], **<%= {:name=>"dept_no"} + cond(5.0, using: :btree) %>)
+          t.index(["emp_no"], **<%= {:name=>"emp_no"} + cond(5.0, using: :btree) %>)
         end
       ERB
 

data/spec/mysql/migrate/migrate_create_table_with_options_spec.rb

@@ -20,11 +20,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
 
       expect(delta.script).to match_fuzzy <<-RUBY
-        create_table("employee_clubs", {:options=>"ENGINE=MyISAM CHARSET=utf8"}) do |t|
-          t.column("emp_no", :"integer", {:null=>false, :unsigned=>true, :limit=>4})
-          t.column("club_id", :"integer", {:null=>false, :unsigned=>true, :limit=>4})
+        create_table("employee_clubs", **{:options=>"ENGINE=MyISAM CHARSET=utf8"}) do |t|
+          t.column("emp_no", :"integer", **{:null=>false, :unsigned=>true, :limit=>4})
+          t.column("club_id", :"integer", **{:null=>false, :unsigned=>true, :limit=>4})
         end
-        add_index("employee_clubs", ["emp_no", "club_id"], {:name=>"idx_emp_no_club_id", :using=>:btree})
+        add_index("employee_clubs", ["emp_no", "club_id"], **{:name=>"idx_emp_no_club_id", :using=>:btree})
       RUBY
     }
   end
@@ -48,11 +48,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
 
       expect(delta.script).to match_fuzzy <<-RUBY
-        create_table("employee_clubs", {:options=>"ENGINE=InnoDB CHARSET=utf8mb4"}) do |t|
-          t.column("emp_no", :"integer", {:null=>false, :unsigned=>true, :limit=>4})
-          t.column("club_id", :"integer", {:null=>false, :unsigned=>true, :limit=>4})
+        create_table("employee_clubs", **{:options=>"ENGINE=InnoDB CHARSET=utf8mb4"}) do |t|
+          t.column("emp_no", :"integer", **{:null=>false, :unsigned=>true, :limit=>4})
+          t.column("club_id", :"integer", **{:null=>false, :unsigned=>true, :limit=>4})
         end
-        add_index("employee_clubs", ["emp_no", "club_id"], {:name=>"idx_emp_no_club_id", :using=>:btree})
+        add_index("employee_clubs", ["emp_no", "club_id"], **{:name=>"idx_emp_no_club_id", :using=>:btree})
       RUBY
     }
   end

data/spec/mysql/migrate/migrate_drop_column_and_index_spec.rb

@@ -138,23 +138,23 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-change_table("dept_emp", {:bulk => true}) do |t|
+change_table("dept_emp", bulk: true) do |t|
   t.remove("emp_no")
   t.remove("from_date")
   t.remove("to_date")
 end
 
-change_table("dept_manager", {:bulk => true}) do |t|
+change_table("dept_manager", bulk: true) do |t|
   t.remove("emp_no")
   t.remove("from_date")
   t.remove("to_date")
 end
 
-change_table("employee_clubs", {:bulk => true}) do |t|
+change_table("employee_clubs", bulk: true) do |t|
   t.remove("club_id")
 end
 
-change_table("employees", {:bulk => true}) do |t|
+change_table("employees", bulk: true) do |t|
   t.remove("last_name")
   t.remove("gender")
   t.remove("hire_date")

data/spec/mysql/migrate/migrate_drop_column_spec.rb

@@ -135,17 +135,17 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        change_table("dept_emp", {:bulk => true}) do |t|
+        change_table("dept_emp", bulk: true) do |t|
           t.remove("from_date")
           t.remove("to_date")
         end
 
-        change_table("dept_manager", {:bulk => true}) do |t|
+        change_table("dept_manager", bulk: true) do |t|
           t.remove("from_date")
           t.remove("to_date")
         end
 
-        change_table("employees", {:bulk => true}) do |t|
+        change_table("employees", bulk: true) do |t|
           t.remove("last_name")
           t.remove("gender")
           t.remove("hire_date")

data/spec/mysql/migrate/migrate_drop_index_spec.rb

@@ -141,16 +141,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        change_table("clubs", {:bulk => true}) do |t|
-          t.remove_index({:name=>"idx_name"})
+        change_table("clubs", bulk: true) do |t|
+          t.remove_index(name: "idx_name")
         end
 
-        change_table("employee_clubs", {:bulk => true}) do |t|
-          t.remove_index({:name=>"idx_emp_no_club_id"})
+        change_table("employee_clubs", bulk: true) do |t|
+          t.remove_index(name: "idx_emp_no_club_id")
         end
 
-        change_table("titles", {:bulk => true}) do |t|
-          t.remove_index({:name=>"emp_no"})
+        change_table("titles", bulk: true) do |t|
+          t.remove_index(name: "emp_no")
         end
       RUBY
       delta.migrate

data/spec/mysql/migrate/migrate_rename_column_spec.rb

@@ -142,15 +142,15 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        change_table("dept_emp", {:bulk => true}) do |t|
+        change_table("dept_emp", bulk: true) do |t|
           t.rename("from_date", "from_date2")
         end
 
-        change_table("dept_manager", {:bulk => true}) do |t|
+        change_table("dept_manager", bulk: true) do |t|
           t.rename("to_date", "to_date2")
         end
 
-        change_table("employees", {:bulk => true}) do |t|
+        change_table("employees", bulk: true) do |t|
           t.rename("gender", "gender2")
         end
       RUBY

data/spec/mysql/migrate/migrate_script_error_spec.rb

@@ -80,7 +80,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_ruby actual_dsl
 
       errmsg = Regexp.new(Regexp.escape(<<-MSG.strip))
-        33: add_index("employee_clubs", ["emp_no", "Xclub_id"], {:name=>"idx_emp_no_club_id", :using=>:btree})
+        33: add_index("employee_clubs", ["emp_no", "Xclub_id"], **{:name=>"idx_emp_no_club_id", :using=>:btree})
       MSG
 
       expect do

data/spec/mysql/~default_name_fk/migrate_create_fk_spec.rb

@@ -36,7 +36,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        add_foreign_key("child", "parent", {:name=>"fk_rails_e74ce85cbc"})
+        add_foreign_key("child", "parent", **{:name=>"fk_rails_e74ce85cbc"})
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

data/spec/mysql/~default_name_fk/migrate_drop_fk_spec.rb

@@ -50,7 +50,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy sorted_actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        remove_foreign_key("child", {:name=>"fk_rails_e74ce85cbc"})
+        remove_foreign_key("child", name: "fk_rails_e74ce85cbc")
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

data/spec/mysql/~dump_auto_increment/migrate_create_table_with_index_spec.rb

@@ -25,13 +25,13 @@ describe 'Ridgepole::Client#diff -> migrate (with index)', condition: '>= 5.1.0'
       expect(delta.differ?).to be_truthy
 
       expect(delta.script).to match_fuzzy erbh(<<-ERB)
-        create_table("dept_emp", {:primary_key=>["emp_no", "dept_no"]}) do |t|
-          t.column("emp_no", :"integer", {:null=>false, :limit=>4})
-          t.column("dept_no", :"integer", {:null=>false, :auto_increment=>true, :limit=>4})
-          t.column("from_date", :"date", {:null=>false})
-          t.column("to_date", :"date", {:null=>false})
-          t.index(["dept_no"], <%= {:name=>"dept_no"} + cond(5.0, using: :btree) %>)
-          t.index(["emp_no"], <%= {:name=>"emp_no"} + cond(5.0, using: :btree) %>)
+        create_table("dept_emp", **{:primary_key=>["emp_no", "dept_no"]}) do |t|
+          t.column("emp_no", :"integer", **{:null=>false, :limit=>4})
+          t.column("dept_no", :"integer", **{:null=>false, :auto_increment=>true, :limit=>4})
+          t.column("from_date", :"date", **{:null=>false})
+          t.column("to_date", :"date", **{:null=>false})
+          t.index(["dept_no"], **<%= {:name=>"dept_no"} + cond(5.0, using: :btree) %>)
+          t.index(["emp_no"], **<%= {:name=>"emp_no"} + cond(5.0, using: :btree) %>)
         end
       ERB
 

data/spec/postgresql/diff/diff_spec.rb

@@ -148,9 +148,9 @@ describe 'Ridgepole::Client.diff' do
       delta = subject.diff(actual_dsl, expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to match_fuzzy <<-RUBY
-        change_column("employee_clubs", "club_id", :integer, {:null=>true, :default=>nil})
+        change_column("employee_clubs", "club_id", :integer, **{:null=>true, :default=>nil})
 
-        change_column("employees", "last_name", :string, {:limit=>20, :default=>"XXX"})
+        change_column("employees", "last_name", :string, **{:limit=>20, :default=>"XXX"})
       RUBY
     }
   end

data/spec/postgresql/fk/migrate_create_fk_spec.rb

@@ -36,7 +36,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        add_foreign_key("child", "parent", {:name=>"child_ibfk_1"})
+        add_foreign_key("child", "parent", **{:name=>"child_ibfk_1"})
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl
@@ -147,7 +147,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        add_foreign_key("child", "parent", {})
+        add_foreign_key("child", "parent", **{})
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

data/spec/postgresql/fk/migrate_drop_fk_spec.rb

@@ -50,7 +50,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy sorted_actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        remove_foreign_key("child", {:name=>"child_ibfk_1"})
+        remove_foreign_key("child", name: "child_ibfk_1")
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

data/spec/postgresql/migrate/migrate_add_column_spec.rb

@@ -141,13 +141,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        change_table("employee_clubs", {:bulk => true}) do |t|
-          t.column("any_col", :string, {:limit=>255, :null=>false})
+        change_table("employee_clubs", bulk: true) do |t|
+          t.column("any_col", :string, **{:limit=>255, :null=>false})
         end
 
-        change_table("employees", {:bulk => true}) do |t|
-          t.column("age", :integer, {:null=>false})
-          t.column("updated_at", :date, {})
+        change_table("employees", bulk: true) do |t|
+          t.column("age", :integer, **{:null=>false})
+          t.column("updated_at", :date, **{})
         end
       RUBY
       delta.migrate

data/spec/postgresql/migrate/migrate_change_column_spec.rb

@@ -138,12 +138,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        change_table("employee_clubs", {:bulk => true}) do |t|
-          t.change("club_id", :integer, {:null=>true, :default=>nil})
+        change_table("employee_clubs", bulk: true) do |t|
+          t.change("club_id", :integer, **{:null=>true, :default=>nil})
         end
 
-        change_table("employees", {:bulk => true}) do |t|
-          t.change("last_name", :string, {:limit=>20, :default=>"XXX"})
+        change_table("employees", bulk: true) do |t|
+          t.change("last_name", :string, **{:limit=>20, :default=>"XXX"})
         end
       RUBY
       delta.migrate

data/spec/postgresql/migrate/migrate_change_index_spec.rb

@@ -140,19 +140,19 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        change_table("dept_emp", {:bulk => true}) do |t|
-          t.remove_index({:name=>"idx_dept_emp_emp_no"})
-          t.index(["from_date"], {:name=>"idx_dept_emp_emp_no", :using=>:btree, :unique=>false})
+        change_table("dept_emp", bulk: true) do |t|
+          t.remove_index(name: "idx_dept_emp_emp_no")
+          t.index(["from_date"], **{:name=>"idx_dept_emp_emp_no", :using=>:btree, :unique=>false})
         end
 
-        change_table("dept_manager", {:bulk => true}) do |t|
-          t.remove_index({:name=>"idx_dept_manager_emp_no"})
-          t.index(["from_date"], {:name=>"idx_dept_manager_emp_no", :using=>:btree, :unique=>false})
+        change_table("dept_manager", bulk: true) do |t|
+          t.remove_index(name: "idx_dept_manager_emp_no")
+          t.index(["from_date"], **{:name=>"idx_dept_manager_emp_no", :using=>:btree, :unique=>false})
         end
 
-        change_table("salaries", {:bulk => true}) do |t|
-          t.remove_index({:name=>"idx_salaries_emp_no"})
-          t.index(["from_date"], {:name=>"idx_salaries_emp_no", :using=>:btree, :unique=>false})
+        change_table("salaries", bulk: true) do |t|
+          t.remove_index(name: "idx_salaries_emp_no")
+          t.index(["from_date"], **{:name=>"idx_salaries_emp_no", :using=>:btree, :unique=>false})
         end
       RUBY
 

data/spec/postgresql/migrate/migrate_drop_column_spec.rb

@@ -134,17 +134,17 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        change_table("dept_emp", {:bulk => true}) do |t|
+        change_table("dept_emp", bulk: true) do |t|
           t.remove("from_date")
           t.remove("to_date")
         end
 
-        change_table("dept_manager", {:bulk => true}) do |t|
+        change_table("dept_manager", bulk: true) do |t|
           t.remove("from_date")
           t.remove("to_date")
         end
 
-        change_table("employees", {:bulk => true}) do |t|
+        change_table("employees", bulk: true) do |t|
           t.remove("last_name")
           t.remove("hire_date")
         end

data/spec/postgresql/migrate/migrate_drop_column_with_index_spec.rb

@@ -137,24 +137,24 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy erbh(<<-ERB)
-change_table("dept_emp", {:bulk => true}) do |t|
+change_table("dept_emp", bulk: true) do |t|
   t.remove("emp_no")
   t.remove("from_date")
   t.remove("to_date")
 end
 
-change_table("dept_manager", {:bulk => true}) do |t|
+change_table("dept_manager", bulk: true) do |t|
   t.remove("emp_no")
   t.remove("from_date")
   t.remove("to_date")
 end
 
-change_table("employee_clubs", {:bulk => true}) do |t|
+change_table("employee_clubs", bulk: true) do |t|
   t.remove("club_id")
-  t.index(["emp_no"], <%= {:name=>"idx_employee_clubs_emp_no"} + cond(5.0, using: :btree) %>)
+  t.index(["emp_no"], **<%= {:name=>"idx_employee_clubs_emp_no"} + cond(5.0, using: :btree) %>)
 end
 
-change_table("employees", {:bulk => true}) do |t|
+change_table("employees", bulk: true) do |t|
   t.remove("last_name")
   t.remove("hire_date")
 end

data/spec/postgresql/migrate/migrate_drop_expression_index_spec.rb

@@ -50,7 +50,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     specify do
       delta = subject.diff(expected_dsl)
       expect(delta).to be_differ
-      expect(delta.script).to match_fuzzy('remove_index("users", {:name=>"index_users_on_lower_name"})')
+      expect(delta.script).to match_fuzzy('remove_index("users", name: "index_users_on_lower_name")')
       expect(subject.dump).to match_fuzzy(actual_dsl)
       delta.migrate
       expect(subject.dump).to match_fuzzy(expected_dsl)

data/spec/postgresql/migrate/migrate_drop_index_spec.rb

@@ -139,16 +139,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        change_table("clubs", {:bulk => true}) do |t|
-          t.remove_index({:name=>"idx_name"})
+        change_table("clubs", bulk: true) do |t|
+          t.remove_index(name: "idx_name")
         end
 
-        change_table("employee_clubs", {:bulk => true}) do |t|
-          t.remove_index({:name=>"idx_employee_clubs_emp_no_club_id"})
+        change_table("employee_clubs", bulk: true) do |t|
+          t.remove_index(name: "idx_employee_clubs_emp_no_club_id")
         end
 
-        change_table("titles", {:bulk => true}) do |t|
-          t.remove_index({:name=>"idx_titles_emp_no"})
+        change_table("titles", bulk: true) do |t|
+          t.remove_index(name: "idx_titles_emp_no")
         end
       RUBY
       delta.migrate

data/spec/postgresql/migrate/migrate_rename_column_spec.rb

@@ -140,11 +140,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        change_table("dept_emp", {:bulk => true}) do |t|
+        change_table("dept_emp", bulk: true) do |t|
           t.rename("from_date", "from_date2")
         end
 
-        change_table("dept_manager", {:bulk => true}) do |t|
+        change_table("dept_manager", bulk: true) do |t|
           t.rename("to_date", "to_date2")
         end
       RUBY

data/spec/postgresql/~default_name_fk/migrate_create_fk_spec.rb

@@ -36,7 +36,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_ruby actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        add_foreign_key("child", "parent", {:name=>"fk_rails_e74ce85cbc"})
+        add_foreign_key("child", "parent", **{:name=>"fk_rails_e74ce85cbc"})
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

data/spec/postgresql/~default_name_fk/migrate_drop_fk_spec.rb

@@ -50,7 +50,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy sorted_actual_dsl
       expect(delta.script).to match_fuzzy <<-RUBY
-        remove_foreign_key("child", {:name=>"fk_rails_e74ce85cbc"})
+        remove_foreign_key("child", name: "fk_rails_e74ce85cbc")
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

data/spec/spec_condition.rb

@@ -12,10 +12,6 @@ module SpecCondition
       ENV['MYSQL57'] == '1'
     end
 
-    def mysql_awesome_enabled?
-      ENV['ENABLE_MYSQL_AWESOME'] == '1'
-    end
-
     def activerecord_5?
       (ActiveRecord::VERSION::MAJOR >= 5) && (ActiveRecord::VERSION::MAJOR < 6)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord