ridgepole 0.8.7 → 0.8.12

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_column3_spec.rb

@@ -99,9 +99,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "last_name", limit: 16, null: false
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
-          t.<%= cond('>= 5.1','bigint', 'integer') %> "products_id"
           t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
-          t.index "products_id"
           t.index "user_id"
         end
       ERB
@@ -115,7 +113,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "last_name", limit: 16, null: false
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
-          t.references :products, :user
+          t.references :user
         end
       RUBY
     end
@@ -138,11 +136,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "last_name", limit: 16, null: false
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
-          t.<%= cond('>= 5.1','bigint', 'integer') %> "products_id"
-          t.string "products_type"
           t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
           t.string "user_type"
-          t.index ["products_type", "products_id"]
           t.index ["user_type", "user_id"]
         end
       ERB
@@ -156,7 +151,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "last_name", limit: 16, null: false
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
-          t.references :products, :user, polymorphic: true
+          t.references :user, polymorphic: true
         end
       RUBY
     end
@@ -174,11 +169,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:actual_dsl) do
       erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
-          t.<%= cond('>= 5.1','bigint', 'integer') %> "products_id", unsigned: true
-          t.string "products_type"
           t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id", unsigned: true
           t.string "user_type"
-          t.index ["products_type", "products_id"]
           t.index ["user_type", "user_id"]
         end
       ERB
@@ -187,7 +179,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:expected_dsl) do
       <<-RUBY
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
-          t.references :products, :user, unsigned: true, polymorphic: true
+          t.references :user, unsigned: true, polymorphic: true
         end
       RUBY
     end
@@ -222,7 +214,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "last_name", limit: 16, null: false
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
-          t.references :products, :user
+          t.references :user
         end
       RUBY
     end
@@ -235,9 +227,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "last_name", limit: 16, null: false
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
-          t.<%= cond('>= 5.1','bigint', 'integer') %> "products_id"
           t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
-          t.index ["products_id"], name: "index_employees_on_products_id", <%= i cond(5.0, using: :btree) %>
           t.index ["user_id"], name: "index_employees_on_user_id", <%= i cond(5.0, using: :btree) %>
         end
       ERB
@@ -276,7 +266,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "last_name", limit: 16, null: false
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
-          t.references :products, :user, polymorphic: true
+          t.references :user, polymorphic: true
         end
       RUBY
     end
@@ -289,11 +279,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "last_name", limit: 16, null: false
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
-          t.<%= cond('>= 5.1','bigint', 'integer') %> "products_id"
-          t.string "products_type"
           t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
           t.string "user_type"
-          t.index ["products_type", "products_id"], name: "index_employees_on_products_type_and_products_id", <%= i cond(5.0, using: :btree) %>
           t.index ["user_type", "user_id"], name: "index_employees_on_user_type_and_user_id", <%= i cond(5.0, using: :btree) %>
         end
       ERB
@@ -310,4 +297,108 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_ruby expected_dsl
     }
   end
+
+  context 'when use references with fk (no change)' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "users", force: :cascade do |t|
+        end
+
+        create_table "employees", primary_key: "emp_no", force: :cascade do |t|
+          t.date   "birth_date", null: false
+          t.string "first_name", limit: 14, null: false
+          t.string "last_name", limit: 16, null: false
+          t.string "gender", limit: 1, null: false
+          t.date   "hire_date", null: false
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
+          t.index "user_id"
+        end
+
+        add_foreign_key("employees", "users")
+      ERB
+    end
+
+    let(:expected_dsl) do
+      erbh(<<-ERB)
+        create_table "users", force: :cascade do |t|
+        end
+
+        create_table "employees", primary_key: "emp_no", force: :cascade do |t|
+          t.date   "birth_date", null: false
+          t.string "first_name", limit: 14, null: false
+          t.string "last_name", limit: 16, null: false
+          t.string "gender", limit: 1, null: false
+          t.date   "hire_date", null: false
+          t.references :user, foreign_key: true
+        end
+      ERB
+    end
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+
+  context 'when use references with fk (change)' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "employees", primary_key: "emp_no", force: :cascade do |t|
+          t.date   "birth_date", null: false
+          t.string "first_name", limit: 14, null: false
+          t.string "last_name", limit: 16, null: false
+          t.string "gender", limit: 1, null: false
+          t.date   "hire_date", null: false
+        end
+        create_table "users", force: :cascade do |t|
+        end
+      ERB
+    end
+
+    let(:dsl) do
+      erbh(<<-ERB)
+        create_table "employees", primary_key: "emp_no", force: :cascade do |t|
+          t.date   "birth_date", null: false
+          t.string "first_name", limit: 14, null: false
+          t.string "last_name", limit: 16, null: false
+          t.string "gender", limit: 1, null: false
+          t.date   "hire_date", null: false
+          t.references :user, foreign_key: true
+        end
+        create_table "users", force: :cascade do |t|
+        end
+      ERB
+    end
+
+    let(:expected_dsl) do
+      erbh(<<-ERB)
+        create_table "employees", primary_key: "emp_no", force: :cascade do |t|
+          t.date   "birth_date", null: false
+          t.string "first_name", limit: 14, null: false
+          t.string "last_name", limit: 16, null: false
+          t.string "gender", limit: 1, null: false
+          t.date   "hire_date", null: false
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id"
+          t.index ["user_id"], name: "index_employees_on_user_id", <%= i cond(5.0, using: :btree) %>
+        end
+        create_table "users", force: :cascade do |t|
+        end
+        add_foreign_key("employees", "users")
+      ERB
+    end
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_ruby actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+  end
 end

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