Skip to content

Commit

Permalink
hotfix for result uploading
Browse files Browse the repository at this point in the history
  • Loading branch information
jreps committed Aug 21, 2024
1 parent ba96ca8 commit adf9eeb
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: Characterization
Type: Package
Title: Characterizations of Cohorts
Version: 2.0.0
Date: 2024-08-07
Version: 2.0.1
Date: 2024-08-21
Authors@R: c(
person("Jenna", "Reps", , "[email protected]", role = c("aut", "cre")),
person("Patrick", "Ryan", , "[email protected]", role = c("aut")),
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Characterization 2.0.1
======================
- edited cohort_type in results to varchar(12)

Characterization 2.0.0
======================
- added tests for all HADES supported dbms
Expand Down
8 changes: 4 additions & 4 deletions inst/settings/resultsDataModelSpecification.csv
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ covariate_ref,value_as_concept_id,int,N,N,N,N,The value as concept_id for featur
covariate_ref,collisions,int,N,N,N,N,The number of collisions found for the covariate_id
covariates,database_id,varchar(100),Yes,Yes,No,No,The database identifier
covariates,setting_id,float,Yes,Yes,No,No,The run identifier
covariates,cohort_type,varchar(10),Yes,Yes,No,No,The cohort type
covariates,cohort_type,varchar(12),Yes,Yes,No,No,The cohort type
covariates,target_cohort_id,int,Yes,Yes,No,No,The target cohort id
covariates,outcome_cohort_id,int,Yes,Yes,No,No,The outcome cohort id
covariates,min_characterization_mean,float,No,Yes,No,No,Minimum fraction for feature extraction
Expand All @@ -72,7 +72,7 @@ covariates,sum_value,int,Yes,No,No,No,The sum value
covariates,average_value,float,No,No,No,No,The average value
covariates_continuous,database_id,varchar(100),Yes,Yes,No,No,The database identifier
covariates_continuous,setting_id,float,Yes,Yes,No,No,The run identifier
covariates_continuous,cohort_type,varchar(10),Yes,Yes,No,No,The cohort type
covariates_continuous,cohort_type,varchar(12),Yes,Yes,No,No,The cohort type
covariates_continuous,target_cohort_id,int,Yes,Yes,No,No,The target cohort id
covariates_continuous,outcome_cohort_id,int,Yes,Yes,No,No,The outcome cohort id
covariates_continuous,covariate_id,bigint,Yes,Yes,No,No,The covariate identifier
Expand Down Expand Up @@ -100,11 +100,11 @@ settings,case_pre_target_duration,int,No,No,No,No,How far to look back before in
settings,case_post_outcome_duration,int,No,No,No,No,How far to look forward after outcome for case features
cohort_details,database_id,varchar(100),Yes,Yes,No,No,The database identifier
cohort_details,setting_id,float,Yes,Yes,No,No,The run identifier
cohort_details,cohort_type,varchar(10),Yes,Yes,No,No,The cohort type
cohort_details,cohort_type,varchar(12),Yes,Yes,No,No,The cohort type
cohort_details,target_cohort_id,int,Yes,Yes,No,No,The target cohort id
cohort_details,outcome_cohort_id,int,Yes,Yes,No,No,The outcome cohort id
cohort_counts,database_id,varchar(100),Yes,No,No,No,The database identifier
cohort_counts,cohort_type,varchar(10),Yes,No,No,No,The cohort type
cohort_counts,cohort_type,varchar(12),Yes,No,No,No,The cohort type
cohort_counts,target_cohort_id,int,Yes,No,No,No,The target cohort id
cohort_counts,outcome_cohort_id,int,Yes,No,No,No,The outcome cohort id
cohort_counts,risk_window_start,int,No,No,No,No,The risk window start
Expand Down
8 changes: 4 additions & 4 deletions inst/sql/sql_server/ResultTables.sql
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ CREATE TABLE @my_schema.@table_prefixcovariate_ref (
CREATE TABLE @my_schema.@table_prefixcovariates (
database_id varchar(100) NOT NULL,
setting_id float NOT NULL,
cohort_type varchar(10),
cohort_type varchar(12),
target_cohort_id int,
outcome_cohort_id int,
min_characterization_mean float,
Expand All @@ -100,7 +100,7 @@ CREATE TABLE @my_schema.@table_prefixcovariates (
CREATE TABLE @my_schema.@table_prefixcovariates_continuous (
database_id varchar(100) NOT NULL,
setting_id float NOT NULL,
cohort_type varchar(10),
cohort_type varchar(12),
target_cohort_id int,
outcome_cohort_id int,
covariate_id bigint NOT NULL,
Expand Down Expand Up @@ -138,15 +138,15 @@ CREATE TABLE @my_schema.@table_prefixsettings (
CREATE TABLE @my_schema.@table_prefixcohort_details (
database_id varchar(100) NOT NULL,
setting_id float NOT NULL,
cohort_type varchar(10),
cohort_type varchar(12),
target_cohort_id int,
outcome_cohort_id int,
PRIMARY KEY (setting_id, database_id,target_cohort_id,outcome_cohort_id,cohort_type)
);

CREATE TABLE @my_schema.@table_prefixcohort_counts(
database_id varchar(100) NOT NULL,
cohort_type varchar(10),
cohort_type varchar(12),
target_cohort_id int,
outcome_cohort_id int,
risk_window_start int,
Expand Down

0 comments on commit adf9eeb

Please sign in to comment.