Merge branch 'master' of github.com:af83/stif-boiv

4 files changed, 20 insertions, 5 deletions

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/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/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
diff --git a/db/schema.rb b/db/schema.rb
index c95280051..a8c90b111 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|
@@ -232,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|
@@ -987,8 +987,8 @@ 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"
   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