Skip to content

Commit

Permalink
Merge pull request #398 from ridgepole/support_check_constraint_merge…
Browse files Browse the repository at this point in the history
…_mode

Support check const merge mode
  • Loading branch information
winebarrel committed Sep 24, 2022
2 parents 62b30f8 + e8334f2 commit 72b884c
Show file tree
Hide file tree
Showing 7 changed files with 201 additions and 6 deletions.
9 changes: 5 additions & 4 deletions lib/ridgepole/diff.rb
Expand Up @@ -473,7 +473,6 @@ def scan_foreign_keys_change(from, to, table_delta, options)
table_delta[:foreign_keys] = foreign_keys_delta unless foreign_keys_delta.empty?
end

# NOTE: @options[:merge] not supported
def scan_check_constraints_change(from, to, table_delta)
from = (from || {}).dup
to = (to || {}).dup
Expand All @@ -496,9 +495,11 @@ def scan_check_constraints_change(from, to, table_delta)
end
end

from.each do |name, from_attrs|
check_constraints_delta[:delete] ||= {}
check_constraints_delta[:delete][name] = from_attrs
unless @options[:merge]
from.each do |name, from_attrs|
check_constraints_delta[:delete] ||= {}
check_constraints_delta[:delete][name] = from_attrs
end
end

table_delta[:check_constraints] = check_constraints_delta unless check_constraints_delta.empty?
Expand Down
36 changes: 36 additions & 0 deletions spec/mysql/migrate/migrate_add_check_constraint_spec.rb
Expand Up @@ -36,4 +36,40 @@
expect(subject.dump).to match_ruby expected_dsl
}
end

context 'when add check constraint' do
let(:actual_dsl) do
erbh(<<-ERB)
create_table "salaries", id: false, force: :cascade do |t|
t.integer "emp_no", null: false
t.integer "salary", null: false
t.date "from_date", null: false
t.date "to_date", null: false
end
ERB
end

let(:expected_dsl) do
erbh(<<-ERB)
create_table "salaries", id: false, force: :cascade do |t|
t.integer "emp_no", null: false
t.integer "salary", null: false
t.date "from_date", null: false
t.date "to_date", null: false
t.check_constraint "`salary` > 100", name: "salary_check"
end
ERB
end

before { subject.diff(actual_dsl).migrate }
subject { client(merge: true) }

it {
delta = subject.diff(expected_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
39 changes: 38 additions & 1 deletion spec/mysql/migrate/migrate_change_check_constraint_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true

describe 'Ridgepole::Client#diff -> migrate', condition: [['>= 6.1', :mysql80]] do
context 'when add check constraint' do
context 'when change check constraint' do
let(:actual_dsl) do
erbh(<<-ERB)
create_table "salaries", id: false, force: :cascade do |t|
Expand Down Expand Up @@ -37,4 +37,41 @@
expect(subject.dump).to match_ruby expected_dsl
}
end

context 'when change check constraint (merge: true)' do
let(:actual_dsl) do
erbh(<<-ERB)
create_table "salaries", id: false, force: :cascade do |t|
t.integer "emp_no", null: false
t.integer "salary", null: false
t.date "from_date", null: false
t.date "to_date", null: false
t.check_constraint "`salary` > 100", name: "salary_check"
end
ERB
end

let(:expected_dsl) do
erbh(<<-ERB)
create_table "salaries", id: false, force: :cascade do |t|
t.integer "emp_no", null: false
t.integer "salary", null: false
t.date "from_date", null: false
t.date "to_date", null: false
t.check_constraint "`salary` > 200", name: "salary_check"
end
ERB
end

before { subject.diff(actual_dsl).migrate }
subject { client(marge: true) }

it {
delta = subject.diff(expected_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
35 changes: 34 additions & 1 deletion spec/mysql/migrate/migrate_drop_check_constraint_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true

describe 'Ridgepole::Client#diff -> migrate', condition: [['>= 6.1', :mysql80]] do
context 'when add check constraint' do
context 'when drop check constraint' do
let(:actual_dsl) do
erbh(<<-ERB)
create_table "salaries", id: false, force: :cascade do |t|
Expand Down Expand Up @@ -36,4 +36,37 @@
expect(subject.dump).to match_ruby expected_dsl
}
end

context 'when drop check constraint (merge: true)' do
let(:actual_dsl) do
erbh(<<-ERB)
create_table "salaries", id: false, force: :cascade do |t|
t.integer "emp_no", null: false
t.integer "salary", null: false
t.date "from_date", null: false
t.date "to_date", null: false
t.check_constraint "`salary` > 100", name: "salary_check"
end
ERB
end

let(:expected_dsl) do
erbh(<<-ERB)
create_table "salaries", id: false, force: :cascade do |t|
t.integer "emp_no", null: false
t.integer "salary", null: false
t.date "from_date", null: false
t.date "to_date", null: false
end
ERB
end

before { subject.diff(actual_dsl).migrate }
subject { client(merge: true) }

it {
delta = subject.diff(expected_dsl)
expect(delta.differ?).to be_falsy
}
end
end
30 changes: 30 additions & 0 deletions spec/postgresql/migrate/migrate_add_check_constraint_spec.rb
Expand Up @@ -30,4 +30,34 @@
expect(subject.dump).to match_ruby expected_dsl
}
end

context 'when add check constraint (merge: true)' do
let(:actual_dsl) do
erbh(<<-ERB)
create_table "clubs", force: :cascade do |t|
t.bigint "value", null: false
end
ERB
end

let(:expected_dsl) do
erbh(<<-ERB)
create_table "clubs", force: :cascade do |t|
t.bigint "value", null: false
t.check_constraint "value > 100", name: "value_check"
end
ERB
end

before { subject.diff(actual_dsl).migrate }
subject { client(merge: true) }

it {
delta = subject.diff(expected_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
31 changes: 31 additions & 0 deletions spec/postgresql/migrate/migrate_change_check_constraint_spec.rb
Expand Up @@ -31,4 +31,35 @@
expect(subject.dump).to match_ruby expected_dsl
}
end

context 'when change check constraint (merge: true)' do
let(:actual_dsl) do
erbh(<<-ERB)
create_table "clubs", force: :cascade do |t|
t.bigint "value", null: false
t.check_constraint "value > 0", name: "value_check"
end
ERB
end

let(:expected_dsl) do
erbh(<<-ERB)
create_table "clubs", force: :cascade do |t|
t.bigint "value", null: false
t.check_constraint "value > 100", name: "value_check"
end
ERB
end

before { subject.diff(actual_dsl).migrate }
subject { client(merge: true) }

it {
delta = subject.diff(expected_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
27 changes: 27 additions & 0 deletions spec/postgresql/migrate/migrate_drop_check_constraint_spec.rb
Expand Up @@ -30,4 +30,31 @@
expect(subject.dump).to match_ruby expected_dsl
}
end

context 'when drop check constraint (merge: true)' do
let(:actual_dsl) do
erbh(<<-ERB)
create_table "clubs", force: :cascade do |t|
t.bigint "value", null: false
t.check_constraint "value > 100", name: "value_check"
end
ERB
end

let(:expected_dsl) do
erbh(<<-ERB)
create_table "clubs", force: :cascade do |t|
t.bigint "value", null: false
end
ERB
end

before { subject.diff(actual_dsl).migrate }
subject { client(merge: true) }

it {
delta = subject.diff(expected_dsl)
expect(delta.differ?).to be_falsy
}
end
end

0 comments on commit 72b884c

Please sign in to comment.