From 9a0bd8665fd28ff36e44cc2eb90c61b8c2ea327b Mon Sep 17 00:00:00 2001
From: clairblacketer <clair.blacketer@gmail.com>
Date: Tue, 2 Oct 2018 09:17:30 -0400
Subject: [PATCH] Bigquery vocab version null and era datetimes

---
 BigQuery/OMOP CDM bigquery ddl.txt            | 42 +++++++++----------
 .../CommonDataModel_Wiki_Files/_Footer.md     |  2 +-
 .../CommonDataModel_Wiki_Files/_Sidebar.md    | 10 ++---
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/BigQuery/OMOP CDM bigquery ddl.txt b/BigQuery/OMOP CDM bigquery ddl.txt
index e1891da..f0f140b 100644
--- a/BigQuery/OMOP CDM bigquery ddl.txt	
+++ b/BigQuery/OMOP CDM bigquery ddl.txt	
@@ -43,7 +43,7 @@ create table vocabulary (
   vocabulary_id			    STRING		not null,
   vocabulary_name		    STRING		not null,
   vocabulary_reference		STRING		not null,
-  vocabulary_version	  	STRING		not null,
+  vocabulary_version	  	STRING		null,
   vocabulary_concept_id		INT64		not null
 )
 ;
@@ -630,13 +630,13 @@ create table cost
 --HINT DISTRIBUTE_ON_KEY(person_id)
 create table drug_era
 (
-  drug_era_id			INT64			not null ,
-  person_id				INT64			not null ,
-  drug_concept_id		INT64			not null ,
-  drug_era_start_date	date			not null ,
-  drug_era_end_date		date			not null ,
-  drug_exposure_count	INT64			null ,
-  gap_days				INT64			null
+  drug_era_id				INT64			not null ,
+  person_id					INT64			not null ,
+  drug_concept_id			INT64			not null ,
+  drug_era_start_datetime	datetime		not null ,
+  drug_era_end_datetime		datetime		not null ,
+  drug_exposure_count		INT64			null ,
+  gap_days					INT64			null
 )
 ;
 
@@ -644,13 +644,13 @@ create table drug_era
 --HINT DISTRIBUTE_ON_KEY(person_id)
 create table dose_era
 (
-  dose_era_id			INT64			not null ,
-  person_id				INT64			not null ,
-  drug_concept_id		INT64			not null ,
-  unit_concept_id		INT64			not null ,
-  dose_value			FLOAT64			not null ,
-  dose_era_start_date	date			not null ,
-  dose_era_end_date	    date			not null
+  dose_era_id				INT64			not null ,
+  person_id					INT64			not null ,
+  drug_concept_id			INT64			not null ,
+  unit_concept_id			INT64			not null ,
+  dose_value				FLOAT64			not null ,
+  dose_era_start_datetime	datetime		not null ,
+  dose_era_end_datetime		datetime		not null
 )
 ;
 
@@ -658,11 +658,11 @@ create table dose_era
 --HINT DISTRIBUTE_ON_KEY(person_id)
 create table condition_era
 (
-  condition_era_id				INT64			not null ,
-  person_id						INT64			not null ,
-  condition_concept_id			INT64			not null ,
-  condition_era_start_date		date			not null ,
-  condition_era_end_date		date			not null ,
-  condition_occurrence_count	INT64			null
+  condition_era_id					INT64			not null ,
+  person_id							INT64			not null ,
+  condition_concept_id				INT64			not null ,
+  condition_era_start_datetime		datetime		not null ,
+  condition_era_end_datetime		datetime		not null ,
+  condition_occurrence_count		INT64			null
 )
 ;
diff --git a/Documentation/CommonDataModel_Wiki_Files/_Footer.md b/Documentation/CommonDataModel_Wiki_Files/_Footer.md
index 914df1d..5324772 100644
--- a/Documentation/CommonDataModel_Wiki_Files/_Footer.md
+++ b/Documentation/CommonDataModel_Wiki_Files/_Footer.md
@@ -1 +1 @@
-***OMOP Common Data Model v5.3.1 Specifications 14June2018***
\ No newline at end of file
+***OMOP Common Data Model v6.0 Specifications 11October2018***
\ No newline at end of file
diff --git a/Documentation/CommonDataModel_Wiki_Files/_Sidebar.md b/Documentation/CommonDataModel_Wiki_Files/_Sidebar.md
index 3a84654..8f40cd0 100644
--- a/Documentation/CommonDataModel_Wiki_Files/_Sidebar.md
+++ b/Documentation/CommonDataModel_Wiki_Files/_Sidebar.md
@@ -21,8 +21,6 @@
 * [CONCEPT_ANCESTOR](https://github.com/OHDSI/CommonDataModel/wiki/CONCEPT_ANCESTOR)
 * [SOURCE_TO_CONCEPT_MAP](https://github.com/OHDSI/CommonDataModel/wiki/SOURCE_TO_CONCEPT_MAP)
 * [DRUG_STRENGTH](https://github.com/OHDSI/CommonDataModel/wiki/DRUG_STRENGTH)
-* [COHORT_DEFINITION](https://github.com/OHDSI/CommonDataModel/wiki/COHORT_DEFINITION)
-* [ATTRIBUTE_DEFINITION](https://github.com/OHDSI/CommonDataModel/wiki/ATTRIBUTE_DEFINITION)  
 
 **[Standardized Metadata](https://github.com/OHDSI/CommonDataModel/wiki/Standardized-Metadata)**
 * [CDM_SOURCE](https://github.com/OHDSI/CommonDataModel/wiki/CDM_SOURCE)  
@@ -55,8 +53,10 @@
 * [COST](https://github.com/OHDSI/CommonDataModel/wiki/COST)  
 
 **[Standardized Derived Elements](https://github.com/OHDSI/CommonDataModel/wiki/Standardized-Derived-Elements)**
-* [COHORT](https://github.com/OHDSI/CommonDataModel/wiki/COHORT)
-* [COHORT_ATTRIBUTE](https://github.com/OHDSI/CommonDataModel/wiki/COHORT_ATTRIBUTE)
 * [DRUG_ERA](https://github.com/OHDSI/CommonDataModel/wiki/DRUG_ERA)
 * [DOSE_ERA](https://github.com/OHDSI/CommonDataModel/wiki/DOSE_ERA)
-* [CONDITION_ERA](https://github.com/OHDSI/CommonDataModel/wiki/CONDITION_ERA)
\ No newline at end of file
+* [CONDITION_ERA](https://github.com/OHDSI/CommonDataModel/wiki/CONDITION_ERA)
+
+**[Results Schema](https://github.com/OHDSI/CommonDataModel/wiki/Results-Schema)**
+* [COHORT](https://github.com/OHDSI/CommonDataModel/wiki/COHORT)
+* [COHORT_DEFINITION](https://github.com/OHDSI/CommonDataModel/wiki/COHORT_DEFINITION)
\ No newline at end of file