-
Notifications
You must be signed in to change notification settings - Fork 125
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.
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 internal column to ServiceTemplate table #238
Merged
Fryguy
merged 6 commits into
ManageIQ:master
from
hsong-rh:add_internal_to_service_template
Aug 9, 2018
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
74a8eda
Add internal column to ServiceTemplate table
hsong-rh 73b158d
Changed to use reserve_table to migrate
hsong-rh 9e0881a
Fix spec errors
hsong-rh e1cbbde
Add include MigrationStubHelper
hsong-rh 8146560
Fix build error
hsong-rh 89b60c3
Added test case for no reserved data
hsong-rh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
29 changes: 29 additions & 0 deletions
29
db/migrate/20180719163110_add_internal_to_service_template.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
class AddInternalToServiceTemplate < ActiveRecord::Migration[5.0] | ||
class ServiceTemplate < ActiveRecord::Base | ||
self.inheritance_column = :_type_disabled | ||
|
||
include ReservedMigrationMixin | ||
include MigrationStubHelper | ||
end | ||
|
||
def up | ||
add_column :service_templates, :internal, :boolean | ||
|
||
say_with_time("Migrate data from reserved table to ServiceTemplate") do | ||
ServiceTemplate.includes(:reserved_rec).where(:type => "ServiceTemplateTransformationPlan").each do |st| | ||
st.reserved_hash_migrate(:internal) | ||
end | ||
end | ||
end | ||
|
||
def down | ||
say_with_time("Migrate data from ServiceTemplate to reserved table") do | ||
ServiceTemplate.includes(:reserved_rec).where(:type => "ServiceTemplateTransformationPlan").each do |st| | ||
st.reserved_hash_set(:internal, st.internal) | ||
st.save! | ||
end | ||
end | ||
|
||
remove_column :service_templates, :internal | ||
end | ||
end |
41 changes: 41 additions & 0 deletions
41
spec/migrations/20180719163110_add_internal_to_service_template_spec.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
require_migration | ||
|
||
describe AddInternalToServiceTemplate do | ||
let(:reserve_stub) { Spec::Support::MigrationStubs.reserved_stub } | ||
let(:service_template_stub) { migration_stub(:ServiceTemplate) } | ||
|
||
migration_context :up do | ||
it "migrate reserve data to ServiceTemplate" do | ||
st = service_template_stub.create!(:type => 'ServiceTemplateTransformationPlan') | ||
reserve_stub.create!( | ||
:resource_type => st.class.name, | ||
:resource_id => st.id, | ||
:reserved => { | ||
:internal => true, | ||
} | ||
) | ||
|
||
migrate | ||
|
||
st.reload | ||
expect(reserve_stub.count).to eq(0) | ||
expect(st.internal).to be_truthy | ||
end | ||
end | ||
|
||
migration_context :down do | ||
it "migrate internal in ServiceTemplate to reserve table" do | ||
st = service_template_stub.create!(:type => 'ServiceTemplateTransformationPlan', :internal => true) | ||
|
||
migrate | ||
|
||
expect(reserve_stub.count).to eq(1) | ||
|
||
reserved_rec = reserve_stub.first | ||
expect(reserved_rec.resource_id).to eq(st.id) | ||
expect(reserved_rec.resource_type).to eq(st.class.name) | ||
|
||
expect(reserved_rec.reserved[:internal]).to be_truthy | ||
end | ||
end | ||
end |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add a test case without reserved data but with
ServiceTemplateTransformationPlan
type?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added.