ridgepole 0.7.0.alpha → 0.7.0.alpha2

data/spec/mysql/fk/migrate_drop_fk_spec.rb

@@ -2,36 +2,33 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when drop fk' do
     let(:actual_dsl) {
       erbh(<<-EOS)
-create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
-end
-
-create_table "child", force: :cascade do |t|
-  t.integer "parent_id"
-end
+        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        end
 
-<%= add_index "child", ["parent_id"], {name: "par_id"} + cond('5.0', using: :btree) %>
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
 
-add_foreign_key "child", "parent", name: "child_ibfk_1"
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
       EOS
     }
 
     let(:sorted_actual_dsl) {
       expected_dsl + (<<-EOS)
-
-add_foreign_key "child", "parent", name: "child_ibfk_1"
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
       EOS
     }
 
     let(:expected_dsl) {
       erbh(<<-EOS)
-create_table "child", force: :cascade do |t|
-  t.integer "parent_id"
-end
-
-<%= add_index "child", ["parent_id"], {name: "par_id"} + cond('5.0', using: :btree) %>
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
 
-create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
-end
+        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        end
       EOS
     }
 
@@ -69,32 +66,134 @@ end
   context 'when drop fk when drop table' do
     let(:dsl) {
       erbh(<<-EOS)
-create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
-end
+        create_table "parent", <%= i cond(5.1, 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) %>
+        end
 
-create_table "child", force: :cascade do |t|
-  t.integer "parent_id"
-end
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
+      EOS
+    }
 
-<%= add_index "child", ["parent_id"], {name: "par_id"} + cond('5.0', using: :btree) %>
+    let(:sorted_dsl) {
+      erbh(<<-EOS)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
+
+        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        end
 
-add_foreign_key "child", "parent", name: "child_ibfk_1"
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
       EOS
     }
 
-    let(:sorted_dsl) {
+    before { subject.diff(dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff('')
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy sorted_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy ''
+    }
+  end
+
+  context 'when drop fk without name' do
+    let(:actual_dsl) {
       erbh(<<-EOS)
-create_table "child", force: :cascade do |t|
-  t.integer "parent_id"
-end
+        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        end
 
-<%= add_index "child", ["parent_id"], {name: "par_id"} + cond('5.0', using: :btree) %>
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
 
-create_table "parent", <%= i cond('5.1', id: :integer) %>, force: :cascade do |t|
-end
+        add_foreign_key "child", "parent"
+      EOS
+    }
+
+    let(:sorted_actual_dsl) {
+      expected_dsl + (<<-EOS)
+        add_foreign_key "child", "parent"
+      EOS
+    }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
+
+        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        end
+      EOS
+    }
+
+    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_fuzzy expected_dsl
+    }
+
+    it {
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4)
+      expect(delta.differ?).to be_truthy
+      expect(delta.script).to match_fuzzy <<-EOS
+        add_foreign_key("child", "parent", {})
+      EOS
+    }
+
+    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 <<-EOS
+        remove_foreign_key("child", "parent")
+      EOS
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
+
+  context 'when drop fk when drop table without name' do
+    let(:dsl) {
+      erbh(<<-EOS)
+        create_table "parent", <%= i cond(5.1, 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) %>
+        end
+
+        add_foreign_key "child", "parent"
+      EOS
+    }
+
+    let(:sorted_dsl) {
+      erbh(<<-EOS)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
+
+        create_table "parent", <%= i cond(5.1, id: :integer) %>, force: :cascade do |t|
+        end
 
-add_foreign_key "child", "parent", name: "child_ibfk_1"
+        add_foreign_key "child", "parent"
       EOS
     }
 

data/spec/mysql/migrate/check_orphan_index_spec.rb

@@ -16,53 +16,53 @@ describe 'Ridgepole::Client#diff -> migrate' do
         add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
 
         create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no",              null: false
-          t.string  "dept_no",   limit: 4, null: false
-          t.date    "from_date",           null: false
-          t.date    "to_date",             null: false
+          t.integer "emp_no", null: false
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
         end
 
         add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
         add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
 
         create_table "dept_manager", id: false, force: :cascade do |t|
-          t.string  "dept_no",   limit: 4, null: false
-          t.integer "emp_no",              null: false
-          t.date    "from_date",           null: false
-          t.date    "to_date",             null: false
+          t.string  "dept_no", limit: 4, null: false
+          t.integer "emp_no", null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
         end
 
         add_index "Xdept_manager", ["dept_no"], name: "dept_no", using: :btree
         add_index "Xdept_manager", ["emp_no"], name: "emp_no", using: :btree
 
         create_table "employee_clubs", force: :cascade do |t|
-          t.integer "emp_no",  null: false, unsigned: true
+          t.integer "emp_no", null: false, unsigned: true
           t.integer "club_id", null: false, unsigned: true
         end
 
         add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
 
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
-          t.date   "birth_date",            null: false
+          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.string "last_name", limit: 16, null: false
+          t.string "gender", limit: 1, null: false
+          t.date   "hire_date", null: false
         end
 
         create_table "salaries", id: false, force: :cascade do |t|
-          t.integer "emp_no",    null: false
-          t.integer "salary",    null: false
+          t.integer "emp_no", null: false
+          t.integer "salary", null: false
           t.date    "from_date", null: false
-          t.date    "to_date",   null: false
+          t.date    "to_date", null: false
         end
 
         add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
 
         create_table "titles", id: false, force: :cascade do |t|
-          t.integer "emp_no",               null: false
-          t.string  "title",     limit: 50, null: false
-          t.date    "from_date",            null: false
+          t.integer "emp_no", null: false
+          t.string  "title", limit: 50, null: false
+          t.date    "from_date", null: false
           t.date    "to_date"
         end
 

data/spec/mysql/migrate/migrate_add_column2_spec.rb

@@ -1,24 +1,12 @@
 describe 'Ridgepole::Client#diff -> migrate' do
-  let(:template_variables) {
-    opts = {
-      sql_int_type: 'int(11)',
-    }
-
-    opts.merge!(
-      sql_int_type: 'int'
-    )
-
-    opts
-  }
-
   context 'when add column (int/noop) (1)' do
     let(:actual_dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
         create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
-          t.string  "dept_no",   limit: 4, null: false
-          t.date    "from_date",           null: false
-          t.date    "to_date",             null: false
+          t.integer "emp_no", null: false
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
         end
       EOS
     }
@@ -26,11 +14,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:expected_dsl) {
       <<-EOS
         create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no",    limit: 4, null: false
-          t.integer "emp_no2",             null: false
-          t.string  "dept_no",   limit: 4, null: false
-          t.date    "from_date",           null: false
-          t.date    "to_date",             null: false
+          t.integer "emp_no", limit: 4, null: false
+          t.integer "emp_no2", null: false
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
         end
       EOS
     }
@@ -46,18 +34,18 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(migrated).to be_truthy
       expect(subject.dump).to match_fuzzy actual_dsl
 
-      expect(sql).to match_fuzzy erbh("ALTER TABLE `dept_emp` ADD `emp_no2` <%= @sql_int_type %> NOT NULL AFTER `emp_no`", template_variables)
+      expect(sql).to match_fuzzy erbh("ALTER TABLE `dept_emp` ADD `emp_no2` int NOT NULL AFTER `emp_no`")
     }
   end
 
   context 'when add column (int/noop) (2)' do
     let(:actual_dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
         create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
-          t.string  "dept_no",   limit: 4, null: false
-          t.date    "from_date",           null: false
-          t.date    "to_date",             null: false
+          t.integer "emp_no", null: false
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
         end
       EOS
     }
@@ -65,11 +53,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:expected_dsl) {
       <<-EOS
         create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no",    limit: 4, null: false
-          t.integer "emp_no2",             null: false
-          t.string  "dept_no",   limit: 4, null: false
-          t.date    "from_date",           null: false
-          t.date    "to_date",             null: false
+          t.integer "emp_no", limit: 4, null: false
+          t.integer "emp_no2", null: false
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
         end
       EOS
     }
@@ -85,18 +73,18 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(migrated).to be_truthy
       expect(subject.dump).to match_fuzzy actual_dsl
 
-      expect(sql).to match_fuzzy erbh("ALTER TABLE `dept_emp` ADD `emp_no2` <%= @sql_int_type %> NOT NULL AFTER `emp_no`", template_variables)
+      expect(sql).to match_fuzzy erbh("ALTER TABLE `dept_emp` ADD `emp_no2` int NOT NULL AFTER `emp_no`")
     }
   end
 
   context 'when add column (int/noop) (3)' do
     let(:actual_dsl) {
-      erbh(<<-EOS, template_variables)
+      erbh(<<-EOS)
         create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no",    <%= i limit(4) + {null: false} %>
-          t.string  "dept_no",   limit: 4, null: false
-          t.date    "from_date",           null: false
-          t.date    "to_date",             null: false
+          t.integer "emp_no", null: false
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
         end
       EOS
     }
@@ -104,11 +92,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:expected_dsl) {
       <<-EOS
         create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no",    limit: 4, null: false
-          t.integer "emp_no2",   limit: 4, null: false
-          t.string  "dept_no",   limit: 4, null: false
-          t.date    "from_date",           null: false
-          t.date    "to_date",             null: false
+          t.integer "emp_no", limit: 4, null: false
+          t.integer "emp_no2", limit: 4, null: false
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
         end
       EOS
     }
@@ -124,7 +112,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(migrated).to be_truthy
       expect(subject.dump).to match_fuzzy actual_dsl
 
-      expect(sql).to match_fuzzy erbh("ALTER TABLE `dept_emp` ADD `emp_no2` <%= @sql_int_type %> NOT NULL AFTER `emp_no`", template_variables)
+      expect(sql).to match_fuzzy erbh("ALTER TABLE `dept_emp` ADD `emp_no2` int NOT NULL AFTER `emp_no`")
     }
   end
 end

data/spec/mysql/migrate/migrate_add_column_order_spec.rb

@@ -3,10 +3,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:actual_dsl) {
       erbh(<<-EOS)
         create_table "dept_emp", force: :cascade do |t|
-          t.integer "emp_no",    null: false
-          t.string  "dept_no",   limit: 4, null: false
-          t.date    "from_date",           null: false
-          t.date    "to_date",             null: false
+          t.integer "emp_no", null: false
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
         end
       EOS
     }
@@ -14,11 +14,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:expected_dsl) {
       erbh(<<-EOS)
         create_table "dept_emp", force: :cascade do |t|
-          t.integer "emp_no0",   null: false
-          t.integer "emp_no",    null: false
-          t.string  "dept_no",   limit: 4, null: false
-          t.date    "from_date",           null: false
-          t.date    "to_date",             null: false
+          t.integer "emp_no0", null: false
+          t.integer "emp_no", null: false
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
         end
       EOS
     }
@@ -51,10 +51,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:actual_dsl) {
       erbh(<<-EOS)
         create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no",    null: false
-          t.string  "dept_no",   limit: 4, null: false
-          t.date    "from_date",           null: false
-          t.date    "to_date",             null: false
+          t.integer "emp_no", null: false
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
         end
       EOS
     }
@@ -62,11 +62,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:expected_dsl) {
       erbh(<<-EOS)
         create_table "dept_emp", id: false, force: :cascade do |t|
-          t.integer "emp_no0",   null: false
-          t.integer "emp_no",    null: false
-          t.string  "dept_no",   limit: 4, null: false
-          t.date    "from_date",           null: false
-          t.date    "to_date",             null: false
+          t.integer "emp_no0", null: false
+          t.integer "emp_no", null: false
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
         end
       EOS
     }
@@ -97,9 +97,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:actual_dsl) {
       erbh(<<-EOS)
         create_table "dept_emp", primary_key: "emp_no", force: :cascade do |t|
-          t.string  "dept_no",   limit: 4, null: false
-          t.date    "from_date",           null: false
-          t.date    "to_date",             null: false
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
         end
       EOS
     }
@@ -107,10 +107,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:expected_dsl) {
       erbh(<<-EOS)
         create_table "dept_emp", primary_key: "emp_no", force: :cascade do |t|
-          t.integer "emp_no0",   null: false
-          t.string  "dept_no",   limit: 4, null: false
-          t.date    "from_date",           null: false
-          t.date    "to_date",             null: false
+          t.integer "emp_no0", null: false
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
         end
       EOS
     }
@@ -142,11 +142,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:actual_dsl) {
       erbh(<<-EOS)
         create_table "dept_emp", primary_key: ["emp_no1", "emp_no2"], force: :cascade do |t|
-          t.integer "emp_no1",             null: false
-          t.integer "emp_no2",             null: false
-          t.string  "dept_no",   limit: 4, null: false
-          t.date    "from_date",           null: false
-          t.date    "to_date",             null: false
+          t.integer "emp_no1", null: false
+          t.integer "emp_no2", null: false
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
         end
       EOS
     }
@@ -154,12 +154,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:expected_dsl) {
       erbh(<<-EOS)
         create_table "dept_emp", primary_key: ["emp_no1", "emp_no2"], force: :cascade do |t|
-          t.integer "emp_no1",             null: false
-          t.integer "emp_no2",             null: false
-          t.integer "emp_no0",             null: false
-          t.string  "dept_no",   limit: 4, null: false
-          t.date    "from_date",           null: false
-          t.date    "to_date",             null: false
+          t.integer "emp_no1", null: false
+          t.integer "emp_no2", null: false
+          t.integer "emp_no0", null: false
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
         end
       EOS
     }
@@ -192,11 +192,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:actual_dsl) {
       erbh(<<-EOS)
         create_table "dept_emp", primary_key: ["emp_no1", "emp_no2"], force: :cascade do |t|
-          t.integer "emp_no1",             null: false
-          t.integer "emp_no2",             null: false
-          t.string  "dept_no",   limit: 4, null: false
-          t.date    "from_date",           null: false
-          t.date    "to_date",             null: false
+          t.integer "emp_no1", null: false
+          t.integer "emp_no2", null: false
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
         end
       EOS
     }
@@ -204,12 +204,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
     let(:expected_dsl) {
       erbh(<<-EOS)
         create_table "dept_emp", primary_key: ["emp_no1", "emp_no2"], force: :cascade do |t|
-          t.integer "emp_no0",             null: false
-          t.integer "emp_no1",             null: false
-          t.integer "emp_no2",             null: false
-          t.string  "dept_no",   limit: 4, null: false
-          t.date    "from_date",           null: false
-          t.date    "to_date",             null: false
+          t.integer "emp_no0", null: false
+          t.integer "emp_no1", null: false
+          t.integer "emp_no2", null: false
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
         end
       EOS
     }