Skip to content

Commit 5e81375

Browse files
committed
missing record keeping
1 parent 4bbb038 commit 5e81375

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

R/runOrphanConcepts.R

+1-2
Original file line numberDiff line numberDiff line change
@@ -397,8 +397,7 @@ runOrphanConcepts <- function(connection,
397397
reportOverallTime = FALSE
398398
)
399399

400-
if ((runIncludedSourceConcepts && nrow(subsetIncluded) > 0) ||
401-
(runOrphanConcepts && nrow(subsetOrphans) > 0)) {
400+
if (nrow(subsetOrphans) > 0) {
402401
ParallelLogger::logTrace("Dropping temp concept count table")
403402
if (conceptCountsTableIsTemp) {
404403
countTable <- conceptCountsTable

tests/testthat/test-runOrphanConcepts.R

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616

1717
for (nm in names(testServers)) {
18-
# nm <- "sqlite"
18+
nm <- "sqlite"
1919
server <- testServers[[nm]]
2020

2121
# Params
@@ -30,11 +30,11 @@ for (nm in names(testServers)) {
3030
conceptCountsDatabaseSchema <- "main"
3131
conceptCountsTable <- "concept_counts"
3232
conceptCountsTableIsTemp <- FALSE
33-
recordKeepingFile <- file.path(exportFolder, "record.csv")
3433
cohortTableNames <- CohortGenerator::getCohortTableNames(cohortTable = server$cohortTable)
3534
cohortDatabaseSchema <- server$cohortDatabaseSchema
3635
cohortTable <- server$cohortTable
37-
incremental <- TRUE
36+
incremental <- FALSE
37+
# incremental <- TRUE
3838
conceptIdTable <- "#concept_ids"
3939

4040
# Tests
@@ -43,7 +43,7 @@ for (nm in names(testServers)) {
4343
connection <- DatabaseConnector::connect(server$connectionDetails)
4444
exportFolder <- file.path(tempdir(), paste0(nm, "no_concept"))
4545
dir.create(exportFolder)
46-
46+
recordKeepingFile <- file.path(exportFolder, "record.csv")
4747
# CreateConceptcounts table
4848

4949
CohortDiagnostics::createConceptCountsTable(connection = connection,
@@ -102,7 +102,7 @@ for (nm in names(testServers)) {
102102
expect_true(file.exists(recordKeepingFile))
103103
recordKeeping <- read.csv(recordKeepingFile)
104104
expect_equal(colnames(recordKeeping), c("cohortId", "task", "checksum" , "timeStamp"))
105-
expect_equal(unique(recordKeeping$task), "runInclusionStatistics")
105+
expect_equal(unique(recordKeeping$task), "runOrphanConcepts")
106106
expect_true(all(recordKeeping$cohortId %in% server$cohortDefinitionSet$cohortId))
107107

108108
unlink(exportFolder)
@@ -175,7 +175,7 @@ for (nm in names(testServers)) {
175175
expect_true(file.exists(recordKeepingFile))
176176
recordKeeping <- read.csv(recordKeepingFile)
177177
expect_equal(colnames(recordKeeping), c("cohortId", "task", "checksum" , "timeStamp"))
178-
expect_equal(unique(recordKeeping$task), "runInclusionStatistics")
178+
expect_equal(unique(recordKeeping$task), "runOrphanConcepts")
179179
expect_true(all(recordKeeping$cohortId %in% server$cohortDefinitionSet$cohortId))
180180

181181
unlink(exportFolder)

0 commit comments

Comments
 (0)