From 15e75e3505194171df43d69096e94f65f032f9e5 Mon Sep 17 00:00:00 2001 From: Xinhui Date: Fri, 22 Sep 2017 14:36:13 +0200 Subject: Nested compliance control block Refs #4585 --- ...2121609_add_compliance_control_id_to_compliance_control_blocks.rb | 5 +++++ db/schema.rb | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 db/migrate/20170922121609_add_compliance_control_id_to_compliance_control_blocks.rb (limited to 'db') diff --git a/db/migrate/20170922121609_add_compliance_control_id_to_compliance_control_blocks.rb b/db/migrate/20170922121609_add_compliance_control_id_to_compliance_control_blocks.rb new file mode 100644 index 000000000..18a6b12cf --- /dev/null +++ b/db/migrate/20170922121609_add_compliance_control_id_to_compliance_control_blocks.rb @@ -0,0 +1,5 @@ +class AddComplianceControlIdToComplianceControlBlocks < ActiveRecord::Migration + def change + add_reference :compliance_control_blocks, :compliance_control, index: true, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index c95280051..45bc74d07 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -217,8 +217,10 @@ ActiveRecord::Schema.define(version: 20170925154017) do t.integer "compliance_control_set_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "compliance_control_id" end + add_index "compliance_control_blocks", ["compliance_control_id"], name: "index_compliance_control_blocks_on_compliance_control_id", using: :btree add_index "compliance_control_blocks", ["compliance_control_set_id"], name: "index_compliance_control_blocks_on_compliance_control_set_id", using: :btree create_table "compliance_control_sets", id: :bigserial, force: :cascade do |t| @@ -987,6 +989,7 @@ ActiveRecord::Schema.define(version: 20170925154017) do add_foreign_key "compliance_checks", "compliance_check_blocks" add_foreign_key "compliance_checks", "compliance_check_sets" add_foreign_key "compliance_control_blocks", "compliance_control_sets" + add_foreign_key "compliance_control_blocks", "compliance_controls" add_foreign_key "compliance_control_sets", "organisations" add_foreign_key "compliance_controls", "compliance_control_blocks" add_foreign_key "compliance_controls", "compliance_control_sets" -- cgit v1.2.3 From a11baf3f9b77d8290aef519310912abdc19ec5bf Mon Sep 17 00:00:00 2001 From: Xinhui Date: Fri, 22 Sep 2017 16:07:03 +0200 Subject: Remove compliance control block id column from compliance_controls table Refs #4585 --- ..._remove_compliance_control_block_id_from_compliance_controls.rb | 5 +++++ db/schema.rb | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20170922123838_remove_compliance_control_block_id_from_compliance_controls.rb (limited to 'db') diff --git a/db/migrate/20170922123838_remove_compliance_control_block_id_from_compliance_controls.rb b/db/migrate/20170922123838_remove_compliance_control_block_id_from_compliance_controls.rb new file mode 100644 index 000000000..e3a6dfcb4 --- /dev/null +++ b/db/migrate/20170922123838_remove_compliance_control_block_id_from_compliance_controls.rb @@ -0,0 +1,5 @@ +class RemoveComplianceControlBlockIdFromComplianceControls < ActiveRecord::Migration + def change + remove_reference :compliance_controls, :compliance_control_block, index: true, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 45bc74d07..a8c90b111 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -234,18 +234,16 @@ ActiveRecord::Schema.define(version: 20170925154017) do create_table "compliance_controls", id: :bigserial, force: :cascade do |t| t.integer "compliance_control_set_id" - t.integer "compliance_control_block_id" t.string "type" t.json "control_attributes" t.string "name" t.string "code" t.string "criticity" t.text "comment" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end - add_index "compliance_controls", ["compliance_control_block_id"], name: "index_compliance_controls_on_compliance_control_block_id", using: :btree add_index "compliance_controls", ["compliance_control_set_id"], name: "index_compliance_controls_on_compliance_control_set_id", using: :btree create_table "connection_links", id: :bigserial, force: :cascade do |t| @@ -991,7 +989,6 @@ ActiveRecord::Schema.define(version: 20170925154017) do add_foreign_key "compliance_control_blocks", "compliance_control_sets" add_foreign_key "compliance_control_blocks", "compliance_controls" add_foreign_key "compliance_control_sets", "organisations" - add_foreign_key "compliance_controls", "compliance_control_blocks" add_foreign_key "compliance_controls", "compliance_control_sets" add_foreign_key "group_of_lines_lines", "group_of_lines", name: "groupofline_group_fkey", on_delete: :cascade add_foreign_key "journey_frequencies", "timebands", on_delete: :nullify -- cgit v1.2.3 From eb761e221efc3ce0b09bfea96415907afac33d4a Mon Sep 17 00:00:00 2001 From: cedricnjanga Date: Wed, 27 Sep 2017 12:31:02 +0200 Subject: Refs #4615 Refacto compliance control models and add origin_code to ComplianceControl model --- db/migrate/20170927095022_add_origin_code_to_compliance_controls.rb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 db/migrate/20170927095022_add_origin_code_to_compliance_controls.rb (limited to 'db') diff --git a/db/migrate/20170927095022_add_origin_code_to_compliance_controls.rb b/db/migrate/20170927095022_add_origin_code_to_compliance_controls.rb new file mode 100644 index 000000000..36f109b91 --- /dev/null +++ b/db/migrate/20170927095022_add_origin_code_to_compliance_controls.rb @@ -0,0 +1,5 @@ +class AddOriginCodeToComplianceControls < ActiveRecord::Migration + def change + add_column :compliance_controls, :origin_code, :string + end +end -- cgit v1.2.3