Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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,
Expand Down
7 changes: 7 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
3 changes: 2 additions & 1 deletion R/ConnectionHandler.R
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
3 changes: 2 additions & 1 deletion R/DataMigrationManager.R
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion R/PooledConnectionHandler.R
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/LICENSE-text.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/articles/CreatingMigrations.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions docs/articles/ExampleProject.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/articles/PackageDesign.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/articles/UploadFunctionality.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/articles/UsingAnExportManager.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/articles/UsingConnectionHandlers.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/articles/UsingPythonUploads.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading