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

1 files changed, 11 insertions, 1 deletions

diff --git a/db/schema.rb b/db/schema.rb
index 3593576de..443fe0579 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,11 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
+<<<<<<< HEAD
 ActiveRecord::Schema.define(version: 20170928144740) do
+=======
+ActiveRecord::Schema.define(version: 20171002080526) do
+>>>>>>> eaf5b3fd868d68856ef94e18656dac39096d866b
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -164,10 +168,15 @@ ActiveRecord::Schema.define(version: 20170928144740) do
     t.datetime "created_at",                   null: false
     t.datetime "updated_at",                   null: false
     t.string   "status"
+<<<<<<< HEAD
+=======
+    t.integer  "compliance_check_set_id"
+>>>>>>> eaf5b3fd868d68856ef94e18656dac39096d866b
   end
 
   add_index "compliance_check_messages", ["compliance_check_id"], name: "index_compliance_check_messages_on_compliance_check_id", using: :btree
   add_index "compliance_check_messages", ["compliance_check_resource_id"], name: "index_compliance_check_messages_on_compliance_check_resource_id", using: :btree
+  add_index "compliance_check_messages", ["compliance_check_set_id"], name: "index_compliance_check_messages_on_compliance_check_set_id", using: :btree
 
   create_table "compliance_check_resources", id: :bigserial, force: :cascade do |t|
     t.string   "status"
@@ -400,9 +409,9 @@ ActiveRecord::Schema.define(version: 20170928144740) do
     t.string   "type"
     t.integer  "parent_id",             limit: 8
     t.string   "parent_type"
-    t.datetime "notified_parent_at"
     t.integer  "current_step",                    default: 0
     t.integer  "total_steps",                     default: 0
+    t.datetime "notified_parent_at"
     t.string   "creator"
   end
 
@@ -986,6 +995,7 @@ ActiveRecord::Schema.define(version: 20170928144740) do
   add_foreign_key "api_keys", "organisations"
   add_foreign_key "compliance_check_blocks", "compliance_check_sets"
   add_foreign_key "compliance_check_messages", "compliance_check_resources"
+  add_foreign_key "compliance_check_messages", "compliance_check_sets"
   add_foreign_key "compliance_check_messages", "compliance_checks"
   add_foreign_key "compliance_check_resources", "compliance_check_sets"
   add_foreign_key "compliance_check_sets", "compliance_control_sets"