From 02a5906458c529d4c7631c2e92241ec9bcc229a1 Mon Sep 17 00:00:00 2001 From: Jamie Gilbert Date: Tue, 19 Dec 2023 11:24:57 -0800 Subject: [PATCH] Changes for notes --- .Rbuildignore | 4 +++- DESCRIPTION | 2 +- R/DataModel.R | 4 ++-- README.md | 4 ++-- man/ResultModelManager-package.Rd | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.Rbuildignore b/.Rbuildignore index 478d71a..d9d76aa 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -32,4 +32,6 @@ deploy.sh compare_versions ^doc$ ^Meta$ -LICENSE \ No newline at end of file +LICENSE +.git +..Rcheck \ No newline at end of file diff --git a/DESCRIPTION b/DESCRIPTION index 9229997..8184983 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: ResultModelManager -Title: Result Model Manager (RMM) for OHDSI packages +Title: Result Model Manager Version: 0.5.6 Authors@R: person("Jamie", "Gilbert", , "gilbert@ohdsi.org", role = c("aut", "cre")) diff --git a/R/DataModel.R b/R/DataModel.R index 4fe3eeb..4531405 100644 --- a/R/DataModel.R +++ b/R/DataModel.R @@ -309,7 +309,7 @@ uploadChunk <- function(chunk, pos, env, specifications, resultsFolder, connecti # Ensure dates are formatted properly toDate <- specifications %>% dplyr::filter( - tableName == env$tableName & + .data$tableName == env$tableName & tolower(.data$dataType) == "date" ) %>% dplyr::select("columnName") %>% @@ -322,7 +322,7 @@ uploadChunk <- function(chunk, pos, env, specifications, resultsFolder, connecti toTimestamp <- specifications %>% dplyr::filter( - tableName == env$tableName & + .data$tableName == env$tableName & grepl("timestamp", tolower(.data$dataType)) ) %>% dplyr::select("columnName") %>% diff --git a/README.md b/README.md index 9494ad4..65356c3 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ ResultModelManager ================== [![Build Status](https://github.com/OHDSI/ResultModelManager/workflows/R-CMD-check/badge.svg)](https://github.com/OHDSI/ResultModelManager/actions?query=workflow%3AR-CMD-check) -[![codecov.io](https://codecov.io/github/OHDSI/ResultModelManager/coverage.svg?branch=main)](https://codecov.io/github/OHDSI/ResultModelManager?branch=main) +[![codecov.io](https://app.codecov.io/github/OHDSI/ResultModelManager/coverage.svg?branch=main)](https://codecov.io/github/OHDSI/ResultModelManager?branch=main) -ResultModelManager (RMM) [HADES](https://ohdsi.github.io/Hades). +ResultModelManager (RMM) [HADES](https://ohdsi.github.io/Hades/). Introduction ============ diff --git a/man/ResultModelManager-package.Rd b/man/ResultModelManager-package.Rd index 4a5bc20..3cd9874 100644 --- a/man/ResultModelManager-package.Rd +++ b/man/ResultModelManager-package.Rd @@ -4,7 +4,7 @@ \name{ResultModelManager-package} \alias{ResultModelManager} \alias{ResultModelManager-package} -\title{ResultModelManager: Result Model Manager (RMM) for OHDSI packages} +\title{ResultModelManager: Result Model Manager} \description{ Database data model management utilities for OHDSI packages. }