Merge pull request #41 from OHDSI/develop

Release 0.5.1

Author: azimov

DESCRIPTION

@@ -1,10 +1,11 @@
 Package: ResultModelManager
 Title: Result Model Manager (RMM) for OHDSI packages
-Version: 0.5.0
+Version: 0.5.1
 Authors@R:
     person("Jamie", "Gilbert", , "[email protected]", role = c("aut", "cre"))
 Description: Database data model management utilities for OHDSI packages.
 License: Apache License
+Language: en-US
 Encoding: UTF-8
 VignetteBuilder: knitr
 Roxygen: list(markdown = TRUE)

NEWS.md

@@ -1,3 +1,9 @@
+# ResultModelManager 0.5.1
+
+Bug fixes:
+
+1. Fixed issue with uploads results from removal of `emptyIsNa` property which is no longer used/required
+
 # ResultModelManager 0.5.0
 Changes:
 1. Added utility function `grantTablePermissions` to make it easier to grant select, delete, insert and update

R/DataModel.R

@@ -463,37 +463,13 @@ uploadResults <- function(connection = NULL,
             resultsFolder = resultsFolder,
             specifications = specifications
           )
+
           chunk <- checkAndFixDuplicateRows(
             table = chunk,
             tableName = env$specTableName,
             resultsFolder = resultsFolder,
             specifications = specifications
           )
-
-          # Primary key fields cannot be NULL, so for some tables convert NAs to empty or zero:
-          toEmpty <- specifications %>%
-            dplyr::filter(
-              tableName == env$specTableName &
-                grepl("varchar", .data$dataType)
-            ) %>%
-            dplyr::select("columnName") %>%
-            dplyr::pull()
-          if (length(toEmpty) > 0) {
-            chunk <- chunk %>%
-              dplyr::mutate_at(toEmpty, naToEmpty)
-          }
-
-          toZero <- specifications %>%
-            dplyr::filter(
-              tableName == env$specTableName &
-                .data$dataType %in% c("int", "bigint", "float")
-            ) %>%
-            dplyr::select("columnName") %>%
-            dplyr::pull()
-          if (length(toZero) > 0) {
-            chunk <- chunk %>%
-              dplyr::mutate_at(toZero, naToZero)
-          }
         }
 
         # Ensure dates are formatted properly
@@ -504,6 +480,7 @@ uploadResults <- function(connection = NULL,
           ) %>%
           dplyr::select("columnName") %>%
           dplyr::pull()
+
         if (length(toDate) > 0) {
           chunk <- chunk %>%
             dplyr::mutate_at(toDate, lubridate::as_date)

ResultModelManager.Rproj

@@ -18,4 +18,5 @@ LineEndingConversion: Posix
 
 BuildType: Package
 PackageInstallArgs: --no-multiarch --with-keep.source
+PackageCheckArgs: --as-cran
 PackageRoxygenize: rd,collate,namespace