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

2 files changed, 8 insertions, 2 deletions

diff --git a/db/migrate/20171016074044_set_code_uiqueness_in_compliance_control.rb b/db/migrate/20171016074044_set_code_uiqueness_in_compliance_control.rb
new file mode 100644
index 000000000..be43dbcf5
--- /dev/null
+++ b/db/migrate/20171016074044_set_code_uiqueness_in_compliance_control.rb
@@ -0,0 +1,5 @@
+class SetCodeUiquenessInComplianceControl < ActiveRecord::Migration
+  def change
+    add_index :compliance_controls, [:code, :compliance_control_set_id], unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 583851ffc..181c83402 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20171010202716) do
+ActiveRecord::Schema.define(version: 20171016074044) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -256,6 +256,7 @@ ActiveRecord::Schema.define(version: 20171010202716) do
     t.integer  "compliance_control_block_id"
   end
 
+  add_index "compliance_controls", ["code", "compliance_control_set_id"], name: "index_compliance_controls_on_code_and_compliance_control_set_id", unique: true, using: :btree
   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
 
@@ -407,9 +408,9 @@ ActiveRecord::Schema.define(version: 20171010202716) 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