ridgepole 0.8.4 → 0.8.9

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.4
+  version: 0.8.9
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2020-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -286,7 +286,9 @@ files:
 - omnibus-ridgepole/package-scripts/ridgepole/postrm
 - ridgepole.gemspec
 - spec/cli_helper.rb
+- spec/dsl_parser/context_spec.rb
 - spec/erb_helper.rb
+- spec/fixtures/for_require_relative_spec.rb
 - spec/hide_pending_formatter.rb
 - spec/mysql/_migrate/migrate_change_table_option_spec.rb
 - spec/mysql/bigint_pk/bigint_pk_spec.rb
@@ -448,7 +450,9 @@ specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.
 test_files:
 - spec/cli_helper.rb
+- spec/dsl_parser/context_spec.rb
 - spec/erb_helper.rb
+- spec/fixtures/for_require_relative_spec.rb
 - spec/hide_pending_formatter.rb
 - spec/mysql/_migrate/migrate_change_table_option_spec.rb
 - spec/mysql/bigint_pk/bigint_pk_spec.rb