ridgepole 0.7.0.alpha → 0.7.0.alpha2

data/spec/postgresql/dump/dump_spec.rb

@@ -7,67 +7,60 @@ describe 'Ridgepole::Client#dump' do
       expect(subject.dump).to match_fuzzy erbh(<<-EOS)
         create_table "clubs", <%= i cond(5.1, id: :serial) + {force: :cascade} %> do |t|
           t.string "name", limit: 255, default: "", null: false
+          t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
         end
 
-        <%= add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree %>
-
         create_table "departments", primary_key: "dept_no", id: :string, limit: 4, force: :cascade do |t|
           t.string "dept_name", limit: 40, null: false
+          t.index ["dept_name"], name: "idx_dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
         end
 
-        <%= add_index "departments", ["dept_name"], name: "idx_dept_name", unique: true, using: :btree %>
-
         create_table "dept_emp", primary_key: ["emp_no", "dept_no"], 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
+          t.index ["dept_no"], name: "idx_dept_emp_dept_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no"], name: "idx_dept_emp_emp_no", <%= i cond(5.0, using: :btree) %>
         end
 
-        <%= add_index "dept_emp", ["dept_no"], name: "idx_dept_emp_dept_no", using: :btree %>
-        <%= add_index "dept_emp", ["emp_no"], name: "idx_dept_emp_emp_no", using: :btree %>
-
         create_table "dept_manager", primary_key: ["emp_no", "dept_no"], 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
+          t.index ["dept_no"], name: "idx_dept_manager_dept_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no"], name: "idx_dept_manager_emp_no", <%= i cond(5.0, using: :btree) %>
         end
 
-        <%= add_index "dept_manager", ["dept_no"], name: "idx_dept_manager_dept_no", using: :btree %>
-        <%= add_index "dept_manager", ["emp_no"], name: "idx_dept_manager_emp_no", using: :btree %>
-
         create_table "employee_clubs", <%= i cond(5.1, id: :serial) + {force: :cascade} %> do |t|
-          t.integer "emp_no",  null: false
+          t.integer "emp_no", null: false
           t.integer "club_id", null: false
+          t.index ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
         end
 
-        <%= add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", using: :btree %>
-
         create_table "employees", primary_key: "emp_no", id: :integer, <%= i cond(5.1, default: nil) %>, 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.date   "hire_date",             null: false
+          t.string "last_name", limit: 16, null: false
+          t.date   "hire_date", null: false
         end
 
         create_table "salaries", primary_key: ["emp_no", "from_date"], 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
+          t.index ["emp_no"], name: "idx_salaries_emp_no", <%= i cond(5.0, using: :btree) %>
         end
 
-        <%= add_index "salaries", ["emp_no"], name: "idx_salaries_emp_no", using: :btree %>
-
         create_table "titles", primary_key: ["emp_no", "title", "from_date"], 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"
+          t.index ["emp_no"], name: "idx_titles_emp_no", <%= i cond(5.0, using: :btree) %>
         end
-
-        <%= add_index "titles", ["emp_no"], name: "idx_titles_emp_no", using: :btree %>
       EOS
     }
   end

data/spec/postgresql/fk/migrate_change_fk_spec.rb

@@ -2,46 +2,99 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change fk' do
     let(:actual_dsl) {
       erbh(<<-EOS)
-create_table "parent", force: :cascade do |t|
-end
-
-create_table "child", force: :cascade do |t|
-  t.integer "parent_id"
-end
+        create_table "parent", force: :cascade do |t|
+        end
 
-<%= add_index "child", ["parent_id"], name: "par_id", 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", on_delete: :cascade
+        add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
       EOS
     }
 
     let(:sorted_actual_dsl) {
       erbh(<<-EOS)
-create_table "child", force: :cascade do |t|
-  t.integer "parent_id"
-end
-
-<%= add_index "child", ["parent_id"], name: "par_id", 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", force: :cascade do |t|
-end
+        create_table "parent", force: :cascade do |t|
+        end
 
-add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
+        add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
       EOS
     }
 
     let(:expected_dsl) {
       erbh(<<-EOS)
-create_table "child", force: :cascade do |t|
-  t.integer "parent_id"
-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_index "child", ["parent_id"], name: "par_id", using: :btree %>
+        create_table "parent", force: :cascade do |t|
+        end
 
-create_table "parent", force: :cascade do |t|
-end
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
+      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
+    }
+  end
+
+  context 'when change fk without name' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "parent", 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", on_delete: :cascade
+      EOS
+    }
+
+    let(:sorted_actual_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", force: :cascade do |t|
+        end
+
+        add_foreign_key "child", "parent", on_delete: :cascade
+      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", force: :cascade do |t|
+        end
 
-add_foreign_key "child", "parent", name: "child_ibfk_1"
+        add_foreign_key "child", "parent"
       EOS
     }
 

data/spec/postgresql/fk/migrate_create_fk_spec.rb

@@ -2,21 +2,19 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create fk' do
     let(:actual_dsl) {
       erbh(<<-EOS)
-create_table "child", force: :cascade do |t|
-  t.integer "parent_id"
-end
-
-<%= add_index "child", ["parent_id"], name: "par_id", 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", force: :cascade do |t|
-end
+        create_table "parent", force: :cascade do |t|
+        end
       EOS
     }
 
     let(:expected_dsl) {
       actual_dsl + (<<-EOS)
-
-add_foreign_key "child", "parent", name: "child_ibfk_1"
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
       EOS
     }
 
@@ -54,32 +52,30 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
   context 'when create fk when create table' do
     let(:dsl) {
       erbh(<<-EOS)
-# Define parent before child
-create_table "parent", force: :cascade do |t|
-end
-
-create_table "child", force: :cascade do |t|
-  t.integer "parent_id", unsigned: true
-end
+        # Define parent before child
+        create_table "parent", force: :cascade do |t|
+        end
 
-<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
+        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) %>
+        end
 
-add_foreign_key "child", "parent", name: "child_ibfk_1"
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
       EOS
     }
 
     let(:sorted_dsl) {
       erbh(<<-EOS)
-create_table "child", force: :cascade do |t|
-  t.integer "parent_id"
-end
-
-<%= add_index "child", ["parent_id"], name: "par_id", 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", force: :cascade do |t|
-end
+        create_table "parent", force: :cascade do |t|
+        end
 
-add_foreign_key "child", "parent", name: "child_ibfk_1"
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
       EOS
     }
 
@@ -98,19 +94,18 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
   context 'already defined' do
     let(:dsl) {
       erbh(<<-EOS)
-# Define parent before child
-create_table "parent", force: :cascade do |t|
-end
-
-create_table "child", force: :cascade do |t|
-  t.integer "parent_id", unsigned: true
-end
+        # Define parent before child
+        create_table "parent", force: :cascade do |t|
+        end
 
-<%= add_index "child", ["parent_id"], name: "par_id", using: :btree %>
+        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) %>
+        end
 
-add_foreign_key "child", "parent", name: "child_ibfk_1"
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
 
-add_foreign_key "child", "parent", name: "child_ibfk_1"
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
       EOS
     }
 
@@ -123,40 +118,64 @@ add_foreign_key "child", "parent", name: "child_ibfk_1"
     }
   end
 
-  context 'no name' do
-    let(:dsl) {
+  context 'when create fk without name' do
+    let(:actual_dsl) {
       erbh(<<-EOS)
-# Define parent before child
-create_table "parent", force: :cascade do |t|
-end
-
-create_table "child", force: :cascade do |t|
-  t.integer "parent_id", unsigned: true
-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_index "child", ["parent_id"], name: "par_id", using: :btree %>
+        create_table "parent", force: :cascade do |t|
+        end
+      EOS
+    }
 
-add_foreign_key "child", "parent"
+    let(:expected_dsl) {
+      actual_dsl + (<<-EOS)
+        add_foreign_key "child", "parent"
       EOS
     }
 
+    before { subject.diff(actual_dsl).migrate }
     subject { client }
 
     it {
-      expect {
-        subject.diff(dsl)
-      }.to raise_error('Foreign key name in `child` is undefined')
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy 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
+        remove_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 actual_dsl
+      expect(delta.script).to match_fuzzy <<-EOS
+        add_foreign_key("child", "parent", {})
+      EOS
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
     }
   end
 
   context 'orphan fk' do
     let(:dsl) {
       erbh(<<-EOS)
-# Define parent before child
-create_table "parent", force: :cascade do |t|
-end
+        # Define parent before child
+        create_table "parent", force: :cascade do |t|
+        end
 
-add_foreign_key "child", "parent", name: "child_ibfk_1"
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
       EOS
     }
 

data/spec/postgresql/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", force: :cascade do |t|
-end
-
-create_table "child", force: :cascade do |t|
-  t.integer "parent_id"
-end
+        create_table "parent", force: :cascade do |t|
+        end
 
-<%= add_index "child", ["parent_id"], name: "par_id", 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", 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", force: :cascade do |t|
-end
+        create_table "parent", 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", force: :cascade do |t|
-end
+        create_table "parent", force: :cascade do |t|
+        end
 
+        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) %>
+        end
 
-create_table "child", force: :cascade do |t|
-  t.integer "parent_id", unsigned: true
-end
+        add_foreign_key "child", "parent", name: "child_ibfk_1"
+      EOS
+    }
 
-<%= add_index "child", ["parent_id"], name: "par_id", 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", 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", force: :cascade do |t|
+        end
 
-<%= add_index "child", ["parent_id"], name: "par_id", 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", 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", 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)
+      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", force: :cascade do |t|
+        end
+
+        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) %>
+        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", force: :cascade do |t|
+        end
 
-add_foreign_key "child", "parent", name: "child_ibfk_1"
+        add_foreign_key "child", "parent"
       EOS
     }