Skip to content

Commit

Permalink
varchar limit altered
Browse files Browse the repository at this point in the history
  • Loading branch information
azimov committed Aug 28, 2024
1 parent e98c495 commit 9121519
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 14 deletions.
1 change: 1 addition & 0 deletions .github/workflows/R_CMD_check_Hades.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- 'main'
pull_request:
branches:
- "*"
- 'main'

name: R-CMD-check
Expand Down
1 change: 1 addition & 0 deletions R/ConceptIds.R
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ exportConceptInformation <- function(connection = NULL,
table = vocabularyTable,
snakeCaseToCamelCase = TRUE
)

if (nrow(data) > 0) {
data <- makeDataExportable(
x = data,
Expand Down
14 changes: 7 additions & 7 deletions inst/settings/resultsDataModelSpecification.csv
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ concept,concept_name,varchar(255),Yes,No,No,Yes,No,Yes,No
concept,domain_id,varchar(20),Yes,No,No,Yes,No,Yes,No
concept,vocabulary_id,varchar(50),Yes,No,No,Yes,No,Yes,No
concept,concept_class_id,varchar(20),Yes,No,No,Yes,No,Yes,No
concept,standard_concept,varchar(1),No,No,No,Yes,No,Yes,No
concept,standard_concept,varchar,No,No,No,Yes,No,Yes,No
concept,concept_code,varchar(255),Yes,No,No,Yes,No,Yes,No
concept,valid_start_date,Date,Yes,No,No,Yes,No,Yes,No
concept,valid_end_date,Date,Yes,No,No,Yes,No,Yes,No
Expand All @@ -105,7 +105,7 @@ concept_relationship,concept_id_2,bigint,Yes,Yes,No,Yes,No,Yes,No
concept_relationship,relationship_id,varchar(20),Yes,Yes,No,Yes,No,Yes,No
concept_relationship,valid_start_date,Date,Yes,No,No,Yes,No,Yes,No
concept_relationship,valid_end_date,Date,Yes,No,No,Yes,No,Yes,No
concept_relationship,invalid_reason,varchar(1),No,No,No,Yes,No,Yes,No
concept_relationship,invalid_reason,varchar,No,No,No,Yes,No,Yes,No
concept_sets,cohort_id,bigint,Yes,Yes,No,Yes,No,No,No
concept_sets,concept_set_id,int,Yes,Yes,No,Yes,No,No,No
concept_sets,concept_set_sql,varchar,Yes,No,No,Yes,No,No,No
Expand All @@ -117,7 +117,7 @@ concept_synonym,language_concept_id,bigint,Yes,Yes,No,Yes,No,Yes,No
database,database_id,varchar,Yes,Yes,No,Yes,No,No,No
database,database_name,varchar,No,No,No,Yes,No,No,No
database,description,varchar,No,No,No,Yes,No,No,No
database,is_meta_analysis,varchar(1),Yes,No,No,Yes,No,No,No
database,is_meta_analysis,varchar,Yes,No,No,Yes,No,No,No
database,vocabulary_version,varchar,No,No,Yes,Yes,No,No,No
database,vocabulary_version_cdm,varchar,No,No,Yes,Yes,No,No,No
domain,domain_id,varchar(20),Yes,Yes,No,Yes,No,Yes,Yes
Expand Down Expand Up @@ -157,8 +157,8 @@ orphan_concept,concept_count,float,Yes,No,No,Yes,Yes,No,No
orphan_concept,concept_subjects,float,Yes,No,No,Yes,Yes,No,No
relationship,relationship_id,varchar(20),Yes,Yes,No,Yes,No,Yes,Yes
relationship,relationship_name,varchar(255),Yes,No,No,Yes,No,Yes,Yes
relationship,is_hierarchical,varchar(1),Yes,No,No,Yes,No,Yes,Yes
relationship,defines_ancestry,varchar(1),Yes,No,No,Yes,No,Yes,Yes
relationship,is_hierarchical,varchar,Yes,No,No,Yes,No,Yes,Yes
relationship,defines_ancestry,varchar,Yes,No,No,Yes,No,Yes,Yes
relationship,reverse_relationship_id,varchar(20),Yes,Yes,No,Yes,No,Yes,Yes
relationship,relationship_concept_id,bigint,Yes,Yes,No,Yes,No,Yes,Yes
resolved_concepts,cohort_id,bigint,Yes,Yes,No,Yes,No,No,No
Expand All @@ -168,8 +168,8 @@ resolved_concepts,database_id,varchar,Yes,Yes,No,Yes,No,No,No
temporal_analysis_ref,analysis_id,int,Yes,Yes,No,Yes,No,No,No
temporal_analysis_ref,analysis_name,varchar,Yes,No,No,Yes,No,No,No
temporal_analysis_ref,domain_id,varchar(20),Yes,Yes,No,Yes,No,No,No
temporal_analysis_ref,is_binary,varchar(1),Yes,No,No,Yes,No,No,No
temporal_analysis_ref,missing_means_zero,varchar(1),No,No,No,Yes,No,No,No
temporal_analysis_ref,is_binary,varchar,Yes,No,No,Yes,No,No,No
temporal_analysis_ref,missing_means_zero,varchar,No,No,No,Yes,No,No,No
temporal_covariate_ref,covariate_id,bigint,Yes,Yes,No,Yes,No,No,No
temporal_covariate_ref,covariate_name,varchar,Yes,No,No,Yes,No,No,No
temporal_covariate_ref,analysis_id,int,Yes,No,No,Yes,No,No,No
Expand Down
14 changes: 7 additions & 7 deletions inst/sql/sql_server/CreateResultsDataModel.sql
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ CREATE TABLE @results_schema.@concept (
domain_id VARCHAR(20) NOT NULL,
vocabulary_id VARCHAR NOT NULL,
concept_class_id VARCHAR(20) NOT NULL,
standard_concept VARCHAR(1),
standard_concept varchar,
concept_code VARCHAR NOT NULL,
valid_start_date DATE NOT NULL,
valid_end_date DATE NOT NULL,
Expand All @@ -236,7 +236,7 @@ CREATE TABLE @results_schema.@concept_relationship (
relationship_id VARCHAR(20) NOT NULL,
valid_start_date DATE NOT NULL,
valid_end_date DATE NOT NULL,
invalid_reason VARCHAR(1),
invalid_reason varchar,
PRIMARY KEY(concept_id_1, concept_id_2, relationship_id)
);

Expand Down Expand Up @@ -266,7 +266,7 @@ CREATE TABLE @results_schema.@database (
database_id VARCHAR NOT NULL,
database_name VARCHAR,
description VARCHAR,
is_meta_analysis VARCHAR(1) NOT NULL,
is_meta_analysis varchar NOT NULL,
vocabulary_version VARCHAR,
vocabulary_version_cdm VARCHAR,
PRIMARY KEY(database_id)
Expand Down Expand Up @@ -361,8 +361,8 @@ CREATE TABLE @results_schema.@orphan_concept (
CREATE TABLE @results_schema.@relationship (
relationship_id VARCHAR(20) NOT NULL,
relationship_name VARCHAR(255) NOT NULL,
is_hierarchical VARCHAR(1) NOT NULL,
defines_ancestry VARCHAR(1) NOT NULL,
is_hierarchical varchar NOT NULL,
defines_ancestry varchar NOT NULL,
reverse_relationship_id VARCHAR(20) NOT NULL,
relationship_concept_id BIGINT NOT NULL,
PRIMARY KEY(relationship_id, reverse_relationship_id, relationship_concept_id)
Expand All @@ -384,8 +384,8 @@ CREATE TABLE @results_schema.@temporal_analysis_ref (
analysis_id INT NOT NULL,
analysis_name VARCHAR NOT NULL,
domain_id VARCHAR(20) NOT NULL,
is_binary VARCHAR(1) NOT NULL,
missing_means_zero VARCHAR(1),
is_binary varchar NOT NULL,
missing_means_zero varchar,
PRIMARY KEY(analysis_id, domain_id)
);

Expand Down

0 comments on commit 9121519

Please sign in to comment.