removed unneeded param writeDBResults

OHDSI · Nov 3, 2023 · 460ffb1 · 460ffb1
1 parent c3d375a
commit 460ffb1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 23 deletions.
diff --git a/R/writeDBResultsTo.R b/R/writeDBResultsTo.R
@@ -17,7 +17,6 @@
 #' Write DQD results database table to json
 #'
 #' @param connection                A connection object
-#' @param connectionDetails         A connectionDetails object for connecting to the CDM database
 #' @param resultsDatabaseSchema     The fully qualified database name of the results schema
 #' @param cdmDatabaseSchema         The fully qualified database name of the CDM schema
 #' @param writeTableName            Name of DQD results table in the database to read from
@@ -28,7 +27,6 @@
 #'
 
 writeDBResultsToJson <- function(connection,
-                                    connectionDetails,
                                     resultsDatabaseSchema,
                                     cdmDatabaseSchema,
                                     writeTableName,
@@ -37,18 +35,16 @@ writeDBResultsToJson <- function(connection,
     metadata <- DatabaseConnector::renderTranslateQuerySql(
           connection,
           sql = "select * from @cdmDatabaseSchema.cdm_source;",
-          cdmDatabaseSchema = cdmDatabaseSchema,
-          targetDialect = connectionDetails$dbms,
-          snakeCaseToCamelCase = TRUE
+          snakeCaseToCamelCase = TRUE,
+          cdmDatabaseSchema = cdmDatabaseSchema
         )
 
     checkResults <- DatabaseConnector::renderTranslateQuerySql(
           connection,
           sql = "select * from @resultsDatabaseSchema.@writeTableName;",
+          snakeCaseToCamelCase = TRUE,
           resultsDatabaseSchema = resultsDatabaseSchema,
-          writeTableName = writeTableName,
-          targetDialect = connectionDetails$dbms,
-          snakeCaseToCamelCase = TRUE
+          writeTableName = writeTableName
         )
 
     # Quick patch for missing value issues related to SQL Only Implementation

diff --git a/man/writeDBResultsToJson.Rd b/man/writeDBResultsToJson.Rd
diff --git a/tests/testthat/test-writeDBResultsTo.R b/tests/testthat/test-writeDBResultsTo.R
@@ -8,25 +8,26 @@ test_that("Write DB results to json", {
   resultsDatabaseSchemaEunomia <- "main"
   writeTableName <- "dqdashboard_results"
 
-  results <- DataQualityDashboard::executeDqChecks(
-    connectionDetails = connectionDetailsEunomia,
-    cdmDatabaseSchema = cdmDatabaseSchemaEunomia,
-    resultsDatabaseSchema = resultsDatabaseSchemaEunomia,
-    cdmSourceName = "Eunomia",
-    checkNames = "measurePersonCompleteness",
-    outputFolder = outputFolder,
-    writeToTable = TRUE,
-    writeTableName = writeTableName
+  expect_warning(
+    results <- DataQualityDashboard::executeDqChecks(
+      connectionDetails = connectionDetailsEunomia,
+      cdmDatabaseSchema = cdmDatabaseSchemaEunomia,
+      resultsDatabaseSchema = resultsDatabaseSchemaEunomia,
+      cdmSourceName = "Eunomia",
+      checkNames = "measurePersonCompleteness",
+      outputFolder = outputFolder,
+      writeToTable = TRUE,
+      writeTableName = writeTableName
+    ),
+    regexp = "^Missing check names.*"
   )
 
-
   connection <- DatabaseConnector::connect(connectionDetailsEunomia)
 
   testExportFile <- "dq-result-test.json"
 
   DataQualityDashboard::writeDBResultsToJson(
     connection,
-    connectionDetailsEunomia,
     resultsDatabaseSchemaEunomia,
     cdmDatabaseSchemaEunomia,
     writeTableName,
@@ -46,7 +47,6 @@ test_that("Write DB results to json", {
     sql = "select count(*) from @resultsDatabaseSchema.@writeTableName;",
     resultsDatabaseSchema = resultsDatabaseSchemaEunomia,
     writeTableName = writeTableName,
-    targetDialect = connectionDetailsEunomia$dbms,
     snakeCaseToCamelCase = TRUE
   )
   expect_true(length(results$CheckResults) == table_rows)