ridgepole 0.8.9 → 0.9.0.rc1

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
@@ -48,12 +48,12 @@ 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
 
         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 +62,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 +88,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 +114,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 +156,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 +173,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|
@@ -186,26 +186,22 @@ describe 'Ridgepole::Client#diff -> migrate' do
     subject { client(dump_without_table_options: false) }
 
     it {
-      expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-MSG).twice
-[WARNING] Table `child` has a foreign key on `parent_id` column, but doesn't have any indexes on the column.
-          Although an index will be added automatically by InnoDB, please add an index explicitly before the next operation.
-      MSG
-      subject.diff(dsl).migrate
-
-      expect(subject.diff(dsl).differ?).to be_truthy
+      expect do
+        subject.diff(dsl).migrate
+      end.to raise_error('The column `parent_id` of the table `child` has a foreign key but no index. Although InnoDB creates an index automatically, please add one explicitly in order for ridgepole to manage it.')
     }
   end
 
   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, 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, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+        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
@@ -224,10 +220,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create fk on the primary key' do
     let(:dsl) do
       erbh(<<-ERB)
-        create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+        create_table "users", force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" }) %> do |t|
         end
 
-        create_table "icons", primary_key: "user_id", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+        create_table "icons", primary_key: "user_id", force: :cascade, <%= i cond('>= 6.1', { charset: 'utf8' }, { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" }) %> do |t|
         end
         add_foreign_key "icons", "users", name: "fk_icons_users"
       ERB
@@ -243,3 +239,56 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
   end
 end
+
+context 'when create fk on the first primary key' do
+  let(:dsl) do
+    erbh(<<-ERB)
+      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", 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|
+        t.integer "user_id", null: false
+        t.integer "employee_id", null: false
+      end
+      add_foreign_key "icons", "users", name: "fk_icons_users"
+    ERB
+  end
+
+  subject { client(dump_without_table_options: false) }
+
+  it {
+    expect(Ridgepole::Logger.instance).to_not receive(:warn)
+    subject.diff(dsl).migrate
+
+    expect(subject.diff(dsl).differ?).to be_falsey
+  }
+end
+
+context 'when create fk on the second primary key' do
+  let(:dsl) do
+    erbh(<<-ERB)
+      create_table "users", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+      end
+
+      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|
+        t.integer "user_id", null: false
+        t.integer "employee_id", null: false
+      end
+      add_foreign_key "icons", "employees", name: "fk_icons_employees"
+    ERB
+  end
+
+  subject { client(dump_without_table_options: false) }
+
+  it {
+    expect do
+      subject.diff(dsl).migrate
+    end.to raise_error('The column `employee_id` of the table `icons` has a foreign key but no index. Although InnoDB creates an index automatically, please add one explicitly in order for ridgepole to manage it.')
+  }
+end

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,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
@@ -60,16 +60,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 +78,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 +108,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 +130,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 +164,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 +180,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 +207,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 +221,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 +243,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 +257,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

data/spec/mysql/fk/migrate_ignore_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
@@ -32,12 +32,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change fk with ignore:true' 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", on_delete: :cascade
@@ -48,10 +48,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", ignore: true