ridgepole 0.9.0.beta → 0.9.3

data/spec/mysql/fk/migrate_create_fk_spec.rb

@@ -6,10 +6,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
       ERB
     end
@@ -43,17 +43,72 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
   end
 
+  context 'when create fk using `t.foreign_key`' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id"
+        end
+
+        create_table "parent", id: :integer, force: :cascade do |t|
+        end
+      ERB
+    end
+
+    let(:expected_dsl) do
+      erbh(actual_dsl + <<-ERB)
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
+      ERB
+    end
+
+    let(:expected_dsl_using_t_foreign_key) do
+      erbh(<<-ERB)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id"
+          t.foreign_key "parent", name: "child_ibfk_1"
+        end
+
+        create_table "parent", id: :integer, force: :cascade do |t|
+        end
+      ERB
+    end
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl_using_t_foreign_key)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_ruby actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+
+    it {
+      delta = client(bulk_change: true).diff(expected_dsl_using_t_foreign_key)
+      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"})
+      RUBY
+      delta.migrate
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+  end
+
   context 'when create fk when create table' do
     let(:dsl) do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "child_ibfk_1"
 
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
       ERB
     end
@@ -62,10 +117,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
 
         add_foreign_key "child", "parent", name: "child_ibfk_1"
@@ -88,14 +143,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id", unsigned: true
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "child_ibfk_1"
 
         add_foreign_key "child", "parent", name: "child_ibfk_1"
 
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
       ERB
     end
@@ -114,10 +169,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
       ERB
     end
@@ -156,7 +211,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         add_foreign_key "child", "parent", name: "child_ibfk_1"
 
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
       ERB
     end
@@ -173,7 +228,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create fk without any indexes for its column' do
     let(:dsl) do
       erbh(<<-ERB)
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+        create_table "parent", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
         end
 
         create_table "child", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
@@ -195,13 +250,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create fk with first key of multiple column indexes for its column' do
     let(:dsl) do
       erbh(<<-ERB)
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" }) %> do |t|
+        create_table "parent", id: :integer, force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" }) %> do |t|
         end
 
         create_table "child", force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" }) %> do |t|
           t.integer "parent_id"
           t.string "name"
-          t.index ["parent_id", "name"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id", "name"], name: "par_id"
         end
         add_foreign_key "child", "parent", name: "child_ibfk_1"
       ERB
@@ -243,10 +298,10 @@ end
 context 'when create fk on the first primary key' do
   let(:dsl) do
     erbh(<<-ERB)
-      create_table "users", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" }) %> do |t|
+      create_table "users", id: :integer, force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" }) %> do |t|
       end
 
-      create_table "employee", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" }) %> do |t|
+      create_table "employee", id: :integer, force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" }) %> do |t|
       end
 
       create_table "icons", primary_key: ["user_id", "employee_id"], force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" }) %> do |t|
@@ -270,10 +325,10 @@ end
 context 'when create fk on the second primary key' do
   let(:dsl) do
     erbh(<<-ERB)
-      create_table "users", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+      create_table "users", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
       end
 
-      create_table "employee", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+      create_table "employee", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
       end
 
       create_table "icons", primary_key: ["user_id", "employee_id"], force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|

data/spec/mysql/fk/migrate_drop_fk_spec.rb

@@ -4,12 +4,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when drop fk' do
     let(:actual_dsl) do
       erbh(<<-ERB)
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "child_ibfk_1"
@@ -26,10 +26,65 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
+        end
+      ERB
+    end
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy sorted_actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+
+    it {
+      delta = client(bulk_change: true).diff(expected_dsl)
+      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")
+      RUBY
+      delta.migrate
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+  end
+
+  context 'when drop fk using `t.foreign_key`' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "parent", id: :integer, force: :cascade do |t|
+        end
+
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id"
+          t.foreign_key "parent", name: "child_ibfk_1"
+        end
+      ERB
+    end
+
+    let(:sorted_actual_dsl) do
+      expected_dsl + <<-RUBY
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
+      RUBY
+    end
+
+    let(:expected_dsl) do
+      erbh(<<-ERB)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id"
+        end
+
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
       ERB
     end
@@ -60,16 +115,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when drop fk when drop table' do
     let(:dsl) do
       erbh(<<-ERB)
-        create_table "users", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "users", id: :integer, force: :cascade do |t|
           t.integer "invitation_id"
-          t.index ["invitation_id"], name: "idx_invitation_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["invitation_id"], name: "idx_invitation_id"
         end
 
         add_foreign_key "users", "invitations", name: "users_ibfk"
 
-        create_table "invitations", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "invitations", id: :integer, force: :cascade do |t|
           t.integer "user_id"
-          t.index ["user_id"], name: "idx_user_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["user_id"], name: "idx_user_id"
         end
 
         add_foreign_key "invitations", "users", name: "invitations_ibfk"
@@ -78,14 +133,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:sorted_dsl) do
       erbh(<<-ERB)
-        create_table "invitations", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "invitations", id: :integer, force: :cascade do |t|
           t.integer "user_id"
-          t.index ["user_id"], name: "idx_user_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["user_id"], name: "idx_user_id"
         end
 
-        create_table "users", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "users", id: :integer, force: :cascade do |t|
           t.integer "invitation_id"
-          t.index ["invitation_id"], name: "idx_invitation_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["invitation_id"], name: "idx_invitation_id"
         end
 
         add_foreign_key "invitations", "users", name: "invitations_ibfk"
@@ -108,12 +163,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when drop fk without name' do
     let(:actual_dsl) do
       erbh(<<-ERB)
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent"
@@ -130,10 +185,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
       ERB
     end
@@ -164,12 +219,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when drop fk when drop table without name' do
     let(:dsl) do
       erbh(<<-ERB)
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent"
@@ -180,10 +235,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
 
         add_foreign_key "child", "parent"
@@ -207,10 +262,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
 
         add_foreign_key "child", "parent", name: "child_ibfk_1"
@@ -221,7 +276,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
       ERB
     end
@@ -243,10 +298,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
-        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "parent", id: :integer, force: :cascade do |t|
         end
 
         add_foreign_key "child", "parent"
@@ -257,7 +312,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
       ERB
     end

data/spec/mysql/fk/migrate_fk_with_column_spec.rb

@@ -4,16 +4,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create fk with column' do
     let(:actual_dsl) do
       erbh(<<-ERB)
-        create_table "direct_messages", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "direct_messages", id: :integer, force: :cascade do |t|
           t.integer "sender_id"
           t.integer "reciever_id"
           t.datetime "created_at", null: false
           t.datetime "updated_at", null: false
-          t.index ["reciever_id"], name: "index_direct_messages_on_reciever_id", <%= i cond(5.0, using: :btree) %>
-          t.index ["sender_id"], name: "index_direct_messages_on_sender_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["reciever_id"], name: "index_direct_messages_on_reciever_id"
+          t.index ["sender_id"], name: "index_direct_messages_on_sender_id"
         end
 
-        create_table "users", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "users", id: :integer, force: :cascade do |t|
           t.string "email"
           t.datetime "created_at", null: false
           t.datetime "updated_at", null: false
@@ -62,16 +62,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:expected_dsl) do
       erbh(<<-ERB)
-        create_table "direct_messages", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "direct_messages", id: :integer, force: :cascade do |t|
           t.integer "sender_id"
           t.integer "reciever_id"
           t.datetime "created_at", null: false
           t.datetime "updated_at", null: false
-          t.index ["reciever_id"], name: "index_direct_messages_on_reciever_id", <%= i cond(5.0, using: :btree) %>
-          t.index ["sender_id"], name: "index_direct_messages_on_sender_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["reciever_id"], name: "index_direct_messages_on_reciever_id"
+          t.index ["sender_id"], name: "index_direct_messages_on_sender_id"
         end
 
-        create_table "users", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "users", id: :integer, force: :cascade do |t|
           t.string "email"
           t.datetime "created_at", null: false
           t.datetime "updated_at", null: false
@@ -106,16 +106,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change fk with column' do
     let(:actual_dsl) do
       erbh(<<-ERB)
-        create_table "direct_messages", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "direct_messages", id: :integer, force: :cascade do |t|
           t.integer "sender_id"
           t.integer "reciever_id"
           t.datetime "created_at", null: false
           t.datetime "updated_at", null: false
-          t.index ["reciever_id"], name: "index_direct_messages_on_reciever_id", <%= i cond(5.0, using: :btree) %>
-          t.index ["sender_id"], name: "index_direct_messages_on_sender_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["reciever_id"], name: "index_direct_messages_on_reciever_id"
+          t.index ["sender_id"], name: "index_direct_messages_on_sender_id"
         end
 
-        create_table "users", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "users", id: :integer, force: :cascade do |t|
           t.string "email"
           t.datetime "created_at", null: false
           t.datetime "updated_at", null: false
@@ -128,16 +128,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:expected_dsl) do
       erbh(<<-ERB)
-        create_table "direct_messages", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "direct_messages", id: :integer, force: :cascade do |t|
           t.integer "sender_id"
           t.integer "reciever_id"
           t.datetime "created_at", null: false
           t.datetime "updated_at", null: false
-          t.index ["reciever_id"], name: "index_direct_messages_on_reciever_id", <%= i cond(5.0, using: :btree) %>
-          t.index ["sender_id"], name: "index_direct_messages_on_sender_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["reciever_id"], name: "index_direct_messages_on_reciever_id"
+          t.index ["sender_id"], name: "index_direct_messages_on_sender_id"
         end
 
-        create_table "users", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        create_table "users", id: :integer, force: :cascade do |t|
           t.string "email"
           t.datetime "created_at", null: false
           t.datetime "updated_at", null: false