Skip to content

Commit e8421df

Browse files
committed
fix cran issues
1 parent 17d2751 commit e8421df

File tree

6 files changed

+21
-20
lines changed

6 files changed

+21
-20
lines changed

R/Eunomia.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ download_eunomia_data <- function(dataset_name = "GiBleed",
187187
#' to a folder on your computer where the datasets will be downloaded to. This file can
188188
#' be opened by calling `usethis::edit_r_environ()`.
189189
#'
190-
#' @param datasetName One of "GiBleed" (default),
190+
#' @param datasetName,dataset_name One of "GiBleed" (default),
191191
#' "synthea-allergies-10k",
192192
#' "synthea-anemia-10k",
193193
#' "synthea-breast_cancer-10k",

R/cdm.R

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@
1818
#'
1919
#' @param con A DBI database connection to a database where an OMOP CDM v5.4 or
2020
#' v5.3 instance is located.
21-
#' @param cdmSchema The schema where the OMOP CDM tables are located. Defaults
21+
#' @param cdmSchema,cdm_schema The schema where the OMOP CDM tables are located. Defaults
2222
#' to NULL.
23-
#' @param writeSchema An optional schema in the CDM database that the user has
23+
#' @param writeSchema,write_schema An optional schema in the CDM database that the user has
2424
#' write access to.
25-
#' @param cohortTables A character vector listing the cohort table names to be
25+
#' @param cohortTables,cohort_tables A character vector listing the cohort table names to be
2626
#' included in the CDM object.
27-
#' @param cdmVersion The version of the OMOP CDM. Cam be "5.3", "5.4", or NULL (default).
27+
#' @param cdmVersion,cdm_version The version of the OMOP CDM. Cam be "5.3", "5.4", or NULL (default).
2828
#' If NULL we will attempt to automatically determine the cdm version using
2929
#' the cdm_source table and heuristics.
30-
#' @param cdmName The name of the CDM. If NULL (default) the cdm_source_name
30+
#' @param cdmName,cdm_name The name of the CDM. If NULL (default) the cdm_source_name
3131
#'. field in the CDM_SOURCE table will be used.
32-
#' @param achillesSchema An optional schema in the CDM database
32+
#' @param achillesSchema,achilles_schema An optional schema in the CDM database
3333
#' that contains achilles tables.
34-
#' @param .softValidation Normally the observation period table should not
34+
#' @param .softValidation,.soft_validation Normally the observation period table should not
3535
#' have overlapping observation periods for a single person. If `.softValidation` is `TRUE` the
3636
#' validation check that looks for overlapping observation periods will be skipped.
3737
#' Other analytic packages may break or produce incorrect results if `softValidation` is `TRUE` and
3838
#' the observation period table contains overlapping observation periods.
3939
#'
40-
#' @param writePrefix A prefix that will be added to all tables created in the write_schema. This
40+
#' @param writePrefix,write_prefix A prefix that will be added to all tables created in the write_schema. This
4141
#' can be used to create namespace in your database write_schema for your tables.
4242
#'
4343
#' @return A list of dplyr database table references pointing to CDM tables

R/utils.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@ ensureInstalled <- function(pkg) {
304304
msg <- paste0(sQuote(pkg), " must be installed for this functionality.")
305305
if (interactive()) {
306306
rlang::inform(paste(msg, "Would you like to install it?", sep = "\n"))
307-
if (menu(c("Yes", "No")) == 1) {
308-
install.packages(pkg)
307+
if (utils::menu(c("Yes", "No")) == 1) {
308+
utils::install.packages(pkg)
309309
} else {
310310
stop(msg, call. = FALSE)
311311
}

man/cdmFromCon.Rd

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/eunomiaDir.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/testthat/test-03-db-generateCohortSet.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ test_that("no error is given if attrition table already exists and overwrite = T
246246

247247
test_that("readCohortSet works from working directory", {
248248
skip("manual test") # seems to work as a standalone test but fails when running testtat
249+
skip_if_not_installed("fs")
249250
fs::dir_copy(system.file("cohorts1", package = "CDMConnector", mustWork = TRUE),
250251
file.path(tempdir(), "cohorts1"),
251252
overwrite = TRUE)

0 commit comments

Comments
 (0)