Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates to support FeatureExtraction v3.6.0 #54

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: Characterization
Type: Package
Title: Characterizations of Cohorts
Version: 0.2.0
Version: 0.2.1
Date: 2024-04-03
Authors@R: c(
person("Jenna", "Reps", , "[email protected]", role = c("aut", "cre")),
Expand All @@ -17,7 +17,7 @@ Depends:
Imports:
Andromeda,
DatabaseConnector (>= 6.3.1),
FeatureExtraction (>= 3.5.0),
FeatureExtraction (>= 3.6.0),
SqlRender (>= 1.9.0),
ParallelLogger (>= 3.0.0),
checkmate,
Expand Down
2 changes: 1 addition & 1 deletion R/AggregateCovariates.R
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ computeAggregateCovariateAnalyses <- function(
cdmDatabaseSchema = cdmDatabaseSchema,
cohortTable = "#agg_cohorts",
cohortTableIsTemp = T,
cohortId = -1,
cohortIds = c(-1),
covariateSettings = aggregateCovariateSettings$covariateSettings,
cdmVersion = cdmVersion,
aggregated = T,
Expand Down
2 changes: 2 additions & 0 deletions inst/settings/resultsDataModelSpecification.csv
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ covariate_ref,covariate_id,bigint,Y,Y,N,N,The covariate identifier
covariate_ref,covariate_name,varchar,Y,N,N,N,The covariate name
covariate_ref,analysis_id,int,Y,N,N,N,The analysis identifier
covariate_ref,concept_id,bigint,Y,N,N,N,The concept identifier
covariate_ref,value_as_concept_id,int,N,N,N,N,The value as concept_id for features created from observation or measurement values
covariate_ref,collisions,int,N,N,N,N,The number of collisions found for the covariate_id
covariates,database_id,varchar(100),Y,Y,N,N,The database identifier
covariates,run_id,int,Y,Y,N,N,The run identifier
covariates,cohort_definition_id,int,Y,Y,N,N,The cohort definition id
Expand Down
4 changes: 3 additions & 1 deletion inst/sql/sql_server/ResultTables.sql
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,9 @@ CREATE TABLE @my_schema.@table_prefixcovariate_ref (
covariate_id int NOT NULL,
covariate_name varchar(max) NOT NULL,
analysis_id int NOT NULL,
concept_id int
concept_id int,
value_as_concept_id int,
collisions int
);

CREATE TABLE @my_schema.@table_prefixcovariates (
Expand Down
Loading