Bad table naming fix

OHDSI · Oct 6, 2023 · d30b34d · d30b34d
1 parent b0b1306
commit d30b34d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/R/cohort-diagnostics-definition.R b/R/cohort-diagnostics-definition.R
@@ -210,14 +210,13 @@ getConceptSetDetailsFromCohortDefinition <-
 
 
 getCdCohortRows <- function(dataSource, cohortIds) {
-  sql <- "SELECT {@use_cg_table} ? {cohort_definition_id as cohort_id,} * FROM @schema.@cohort_table
-    WHERE {@use_cg_table} ? {cohort_definition_id} : {cohort_id} IN (@cohort_ids)"
+  sql <- "SELECT * FROM @schema.@cohort_table
+    WHERE cohort_id IN (@cohort_ids)"
   dataSource$connectionHandler$queryDb(
     sql = sql,
     schema = dataSource$schema,
     cohort_table = dataSource$cohortTableName,
-    cohort_ids = cohortIds,
-    use_cg_table = dataSource$useCgTable
+    cohort_ids = cohortIds
   )
 }
 

diff --git a/R/cohort-diagnostics-main.R b/R/cohort-diagnostics-main.R
@@ -274,7 +274,7 @@ createCdDatabaseDataSource <- function(
 }
 
 getDatabaseTable <- function(dataSource) {
-  databaseTable <- loadResultsTable(dataSource, dataSource$databaseTable, required = TRUE)
+  databaseTable <- loadResultsTable(dataSource, dataSource$prefixTable(dataSource$databaseTable), required = TRUE)
   if (nrow(databaseTable) > 0 &
     "vocabularyVersion" %in% colnames(databaseTable)) {
     databaseTable <- databaseTable %>%