Ensure database_id applied to all returned cohort counts (#144)

OHDSI · May 15, 2024 · 1f0fda0 · 1f0fda0
1 parent 7adc2f6
commit 1f0fda0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/R/CohortCount.R b/R/CohortCount.R
@@ -60,8 +60,7 @@ getCohortCounts <- function(connectionDetails = NULL,
     sql = sql,
     cohort_database_schema = cohortDatabaseSchema,
     cohort_table = cohortTable,
-    cohort_ids = cohortIds,
-    database_id = ifelse(test = is.null(databaseId), yes = "", no = databaseId)
+    cohort_ids = cohortIds
   )
   sql <- SqlRender::translate(sql = sql, targetDialect = connection@dbms)
   tablesInServer <- tolower(DatabaseConnector::getTableNames(conn = connection, databaseSchema = cohortDatabaseSchema))
@@ -88,6 +87,9 @@ getCohortCounts <- function(connectionDetails = NULL,
         cohortSubjects = ifelse(is.na(cohortSubjects), 0L, cohortSubjects)
       )
     }
+    if (!is.null(databaseId)) {
+      counts$databaseId <- databaseId
+    }
     return(counts)
   } else {
     warning("Cohort table was not found. Was it created?")

diff --git a/inst/sql/sql_server/CohortCounts.sql b/inst/sql/sql_server/CohortCounts.sql
@@ -1,5 +1,4 @@
 SELECT
-  {@database_id != ''}?{CAST('@database_id' as VARCHAR(255)) as database_id,}
   cohort_definition_id AS cohort_id,
   COUNT(*) AS cohort_entries,
   COUNT(DISTINCT subject_id) AS cohort_subjects

diff --git a/tests/testthat/test-CohortCount.R b/tests/testthat/test-CohortCount.R
@@ -111,12 +111,14 @@ test_that("Call getCohortCounts with a cohortDefinitionSet returns 0 counts for
     cohortDatabaseSchema = "main",
     cohortTable = "cohort",
     cohortIds = c(1, 2, 100),
-    cohortDefinitionSet = cohortDefinitionSet
+    cohortDefinitionSet = cohortDefinitionSet,
+    databaseId = 999
   )
 
   expect_true(nrow(testCohortCounts) == 3)
   expect_true(testCohortCounts[testCohortCounts$cohortId == 100, "cohortEntries"] == 0)
   expect_true(testCohortCounts[testCohortCounts$cohortId == 100, "cohortSubjects"] == 0)
+  expect_true(all(testCohortCounts$databaseId == 999))
 })
 
 test_that("Call getCohortCounts with no cohortId specified and cohortDefinitionSet returns 0 counts for cohortId not in cohort table", {