Merge pull request #373 from OHDSI/develop

Develop
OHDSI · Feb 28, 2023 · ee03f69 · ee03f69
2 parents ff70fe7 + e083074
commit ee03f69
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,8 +2,8 @@ Package: PatientLevelPrediction
 Type: Package
 Title: Developing patient level prediction using data in the OMOP Common Data
     Model
-Version: 6.2.0
-Date: 2023-02-15
+Version: 6.2.1
+Date: 2023-02-28
 Authors@R: c(
     person("Jenna", "Reps", email = "[email protected]", role = c("aut", "cre")),
     person("Martijn", "Schuemie", role = c("aut")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+PatientLevelPrediction 6.2.1
+======================
+- added ensure_installed("ResultModelManager") to getDataMigrator()
+
 PatientLevelPrediction 6.1.0
 ======================
 - shiny app is now using ShinyAppBuilder with a config saved in the /inst folder

diff --git a/R/DatabaseMigration.R b/R/DatabaseMigration.R
@@ -12,6 +12,7 @@
 #' @export
 migrateDataModel <- function(connectionDetails, databaseSchema, tablePrefix = "") {
   ParallelLogger::logInfo("Migrating data set")
+
   migrator <- getDataMigrator(
     connectionDetails = connectionDetails, 
     databaseSchema = databaseSchema, 
@@ -37,6 +38,8 @@ migrateDataModel <- function(connectionDetails, databaseSchema, tablePrefix = ""
 
 
 getDataMigrator <- function(connectionDetails, databaseSchema, tablePrefix = "") {
+  ensure_installed("ResultModelManager")
+
   ResultModelManager::DataMigrationManager$new(
     connectionDetails = connectionDetails,
     databaseSchema = databaseSchema,

diff --git a/inst/sql/sqlite/PlpResultTables.sql b/inst/sql/sqlite/PlpResultTables.sql
@@ -132,7 +132,7 @@ CREATE TABLE  @my_schema.@string_to_appenddiagnostic_predictors( -- call this km
    diagnostic_id int NOT NULL,
    days_to_event int,
    outcome_at_time int,
-   observed_at_start_of_day bigint
+   observed_at_start_of_day bigint,
    probast_id varchar(50),
    input_type varchar(50),
    FOREIGN KEY (diagnostic_id) REFERENCES @string_to_appenddiagnostics(diagnostic_id)