From aadb24bf33c6e0d70069730e3f7ae723c8334db8 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Wed, 26 Nov 2014 16:47:57 -0900
Subject: [PATCH] Consolidating strainsobservations & measurements.

---
 .../00007_AddStrainsObservations_down.sql       |  5 -----
 .../00007_AddStrainsObservations_up.sql         | 17 -----------------
 ...=> 00007_AddText_Measurement_Types_down.sql} |  0
 ...l => 00007_AddText_Measurement_Types_up.sql} |  0
 ...es_down.sql => 00008_AddUnit_Types_down.sql} |  0
 ..._Types_up.sql => 00008_AddUnit_Types_up.sql} |  0
 ..._down.sql => 00009_AddMeasurements_down.sql} |  0
 ...ents_up.sql => 00009_AddMeasurements_up.sql} |  6 ++++--
 8 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 datastore/migrations/00007_AddStrainsObservations_down.sql
 delete mode 100644 datastore/migrations/00007_AddStrainsObservations_up.sql
 rename datastore/migrations/{00008_AddText_Measurement_Types_down.sql => 00007_AddText_Measurement_Types_down.sql} (100%)
 rename datastore/migrations/{00008_AddText_Measurement_Types_up.sql => 00007_AddText_Measurement_Types_up.sql} (100%)
 rename datastore/migrations/{00009_AddUnit_Types_down.sql => 00008_AddUnit_Types_down.sql} (100%)
 rename datastore/migrations/{00009_AddUnit_Types_up.sql => 00008_AddUnit_Types_up.sql} (100%)
 rename datastore/migrations/{00010_AddMeasurements_down.sql => 00009_AddMeasurements_down.sql} (100%)
 rename datastore/migrations/{00010_AddMeasurements_up.sql => 00009_AddMeasurements_up.sql} (84%)

diff --git a/datastore/migrations/00007_AddStrainsObservations_down.sql b/datastore/migrations/00007_AddStrainsObservations_down.sql
deleted file mode 100644
index c67ba07..0000000
--- a/datastore/migrations/00007_AddStrainsObservations_down.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- bactdb
--- Matthew R Dillon
-
-DROP TABLE strainsobservations;
-
diff --git a/datastore/migrations/00007_AddStrainsObservations_up.sql b/datastore/migrations/00007_AddStrainsObservations_up.sql
deleted file mode 100644
index 4c939be..0000000
--- a/datastore/migrations/00007_AddStrainsObservations_up.sql
+++ /dev/null
@@ -1,17 +0,0 @@
--- bactdb
--- Matthew R Dillon
-
-CREATE TABLE strainsobservations (
-    id BIGSERIAL NOT NULL,
-    strain_id BIGINT NOT NULL,
-    observations_id BIGINT NOT NULL,
-
-    created_at TIMESTAMP WITH TIME ZONE,
-    updated_at TIMESTAMP WITH TIME ZONE,
-    deleted_at TIMESTAMP WITH TIME ZONE,
-
-    CONSTRAINT strainsobservations_pkey PRIMARY KEY (id),
-    FOREIGN KEY (strain_id) REFERENCES strains(id),
-    FOREIGN KEY (observations_id) REFERENCES observations(id)
-);
-
diff --git a/datastore/migrations/00008_AddText_Measurement_Types_down.sql b/datastore/migrations/00007_AddText_Measurement_Types_down.sql
similarity index 100%
rename from datastore/migrations/00008_AddText_Measurement_Types_down.sql
rename to datastore/migrations/00007_AddText_Measurement_Types_down.sql
diff --git a/datastore/migrations/00008_AddText_Measurement_Types_up.sql b/datastore/migrations/00007_AddText_Measurement_Types_up.sql
similarity index 100%
rename from datastore/migrations/00008_AddText_Measurement_Types_up.sql
rename to datastore/migrations/00007_AddText_Measurement_Types_up.sql
diff --git a/datastore/migrations/00009_AddUnit_Types_down.sql b/datastore/migrations/00008_AddUnit_Types_down.sql
similarity index 100%
rename from datastore/migrations/00009_AddUnit_Types_down.sql
rename to datastore/migrations/00008_AddUnit_Types_down.sql
diff --git a/datastore/migrations/00009_AddUnit_Types_up.sql b/datastore/migrations/00008_AddUnit_Types_up.sql
similarity index 100%
rename from datastore/migrations/00009_AddUnit_Types_up.sql
rename to datastore/migrations/00008_AddUnit_Types_up.sql
diff --git a/datastore/migrations/00010_AddMeasurements_down.sql b/datastore/migrations/00009_AddMeasurements_down.sql
similarity index 100%
rename from datastore/migrations/00010_AddMeasurements_down.sql
rename to datastore/migrations/00009_AddMeasurements_down.sql
diff --git a/datastore/migrations/00010_AddMeasurements_up.sql b/datastore/migrations/00009_AddMeasurements_up.sql
similarity index 84%
rename from datastore/migrations/00010_AddMeasurements_up.sql
rename to datastore/migrations/00009_AddMeasurements_up.sql
index 31c1d72..22a3c3c 100644
--- a/datastore/migrations/00010_AddMeasurements_up.sql
+++ b/datastore/migrations/00009_AddMeasurements_up.sql
@@ -3,7 +3,8 @@
 
 CREATE TABLE measurements (
     id BIGSERIAL NOT NULL,
-    strainsobservations_id BIGINT,
+    strain_id BIGINT,
+    observation_id BIGINT,
     text_measurement_type_id BIGINT NULL,
     measurement_value NUMERIC(6, 4) NULL,
     confidence_interval NUMERIC(6, 4) NULL,
@@ -14,7 +15,8 @@ CREATE TABLE measurements (
     deleted_at TIMESTAMP WITH TIME ZONE,
 
     CONSTRAINT strainsobsmeasurements_pkey PRIMARY KEY (id),
-    FOREIGN KEY (strainsobservations_id) REFERENCES strainsobservations(id),
+    FOREIGN KEY (strain_id) REFERENCES strains(id),
+    FOREIGN KEY (observation_id) REFERENCES observations(id),
     FOREIGN KEY (text_measurement_type_id) REFERENCES text_measurement_types(id),
     FOREIGN KEY (unit_type_id) REFERENCES unit_types(id),
     CONSTRAINT exclusive_data_type CHECK (