Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add delete on cascade to fk_svc_inst_op_svc_instance_id #2905

Merged
merged 3 commits into from
Sep 13, 2022
Merged

Add delete on cascade to fk_svc_inst_op_svc_instance_id #2905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea7d7e4
Add delete on cascade to fk_svc_inst_op_svc_instance_id
kathap Aug 5, 2022
87799ea
Improve description text of migration and test, remove unrelated test…
kathap Sep 12, 2022
dad5875
Remove association dependency to be consistent with service binding o…
kathap Sep 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/models/services/service_instance.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ class InvalidServiceBinding < StandardError; end
serialize_attributes :json, :tags

one_to_one :service_instance_operation
add_association_dependencies service_instance_operation: :destroy

one_to_many :service_bindings, before_add: :validate_service_binding, key: :service_instance_guid, primary_key: :guid
one_to_many :service_keys
Expand Down
18 changes: 18 additions & 0 deletions db/migrations/20220805145100_add_delete_on_cascade_to_fk_svc_inst_op_svc_instance_id.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
Sequel.migration do
# Add DELETE CASCADE to foreign key fk_svc_inst_op_svc_instance_id to ensure that 'service instance operations'
# are deleted together with the referenced 'service instance'.

up do
alter_table :service_instance_operations do
drop_constraint :fk_svc_inst_op_svc_instance_id, type: :foreign_key
add_foreign_key [:service_instance_id], :service_instances, key: :id, name: :fk_svc_inst_op_svc_instance_id, on_delete: :cascade
end
end

down do
alter_table :service_instance_operations do
drop_constraint :fk_svc_inst_op_svc_instance_id, type: :foreign_key
add_foreign_key [:service_instance_id], :service_instances, key: :id, name: :fk_svc_inst_op_svc_instance_id
end
end
end
10 changes: 10 additions & 0 deletions spec/unit/models/services/service_instance_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,16 @@ module VCAP::CloudController
expect(ServiceInstanceAnnotationModel.where(id: annotation.id)).to be_empty
end

it 'cascade deletes the related ServiceInstanceOperation for this instance' do
last_operation = ServiceInstanceOperation.make
service_instance.service_instance_operation = last_operation

service_instance.destroy

expect(ServiceInstance.find(id: service_instance.id)).to be_nil
expect(ServiceInstanceOperation.find(id: last_operation.id)).to be_nil
end

it 'creates a DELETED service usage event' do
expect {
service_instance.destroy
Expand Down