diff --git a/DESCRIPTION b/DESCRIPTION index 5fc2edb..c2b2d7f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: ResultModelManager Title: Result Model Manager -Version: 0.6.0 +Version: 0.6.1 Authors@R: person("Jamie", "Gilbert", , "gilbert@ohdsi.org", role = c("aut", "cre")) Description: Database data model management utilities for R packages in the Observational Health Data Sciences and @@ -16,7 +16,7 @@ RoxygenNote: 7.3.2 Depends: R (>= 4.1.0), R6, - DatabaseConnector (>= 6.0.0) + DatabaseConnector (>= 7.0.0) Imports: SqlRender, ParallelLogger, diff --git a/NEWS.md b/NEWS.md index bd32a20..243c1a3 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,10 @@ +# ResultModelManager 0.6.1 + +Bug Fixes: + +1. Removed use of `dbGetQuery` call in pooled connection handler, requiring support for DatabaseConnector 7 + + # ResultModelManager 0.6.0 Changes: diff --git a/R/ConnectionHandler.R b/R/ConnectionHandler.R index 141c8d3..e9051de 100644 --- a/R/ConnectionHandler.R +++ b/R/ConnectionHandler.R @@ -151,8 +151,9 @@ ConnectionHandler <- R6::R6Class( #' @description #' Closes connection (if active) finalize = function() { - if (interactive()) + if (interactive()) { rlang::inform("Due to changes in the R6 package, this method is deprecated and will be removed in a future version. Please use closeConnection instead") + } if (self$isActive & self$dbIsValid()) { self$closeConnection() } diff --git a/R/DataMigrationManager.R b/R/DataMigrationManager.R index cf40181..b4bd932 100644 --- a/R/DataMigrationManager.R +++ b/R/DataMigrationManager.R @@ -253,8 +253,9 @@ DataMigrationManager <- R6::R6Class( #' @description #' Deprecated call, will be removed in a future version finalize = function() { - if (interactive()) + if (interactive()) { rlang::inform("Due to changes in the R6 package, this method is deprecated and will be removed in a future version. Please use closeConnection instead") + } self$closeConnection() } diff --git a/R/PooledConnectionHandler.R b/R/PooledConnectionHandler.R index c92d6d1..cfe8afa 100644 --- a/R/PooledConnectionHandler.R +++ b/R/PooledConnectionHandler.R @@ -275,7 +275,7 @@ PooledConnectionHandler <- R6::R6Class( #' @param connection db connection assumes pooling is handled outside of call #' @param snakeCaseToCamelCase (Optional) Boolean. return the results columns in camel case (default) queryFunction = function(sql, snakeCaseToCamelCase = self$snakeCaseToCamelCase, connection) { - data <- DatabaseConnector::dbGetQuery(connection, sql, translate = FALSE) + data <- DatabaseConnector::querySql(connection, sql) if (snakeCaseToCamelCase) { colnames(data) <- SqlRender::snakeCaseToCamelCase(colnames(data)) } else { diff --git a/docs/404.html b/docs/404.html index 21d38e8..fb3de89 100644 --- a/docs/404.html +++ b/docs/404.html @@ -20,7 +20,7 @@ ResultModelManager - 0.6.0 + 0.6.1