Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Override getConnection in PooledConnectionHandler so it returns the c… #63

Closed
wants to merge 11 commits into from
+7 −3
Closed

Override getConnection in PooledConnectionHandler so it returns the c… #63

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c1be23c
Merge pull request #41 from OHDSI/develop
azimov Sep 15, 2023
7320896
Merge pull request #44 from OHDSI/develop
azimov Nov 8, 2023
d457b19
Merge pull request #45 from OHDSI/develop
azimov Nov 9, 2023
ebfaf9c
Merge pull request #46 from OHDSI/develop
azimov Nov 30, 2023
4a3af3a
Merge pull request #49 from OHDSI/develop
azimov Dec 15, 2023
3033804
Merge pull request #50 from OHDSI/develop
azimov Dec 18, 2023
851e0fa
Merge branch 'develop' into main
azimov Dec 18, 2023
5810069
Merge branch 'develop' into main
azimov Dec 18, 2023
1cff4f0
Merge pull request #54 from OHDSI/develop
azimov May 2, 2024
ad706b4
Merge pull request #57 from OHDSI/develop
azimov Jun 12, 2024
9c3d841
Override getConnection in PooledConnectionHandler so it returns the c…
mccullen Jul 17, 2024
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
10 changes: 7 additions & 3 deletions R/PooledConnectionHandler.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,15 @@ PooledConnectionHandler <- R6::R6Class(
#' get dbms
#' @description Get the dbms type of the connection
dbms = function() {
conn <- pool::poolCheckout(self$getConnection())
conn <- self$getConnection()
on.exit(pool::poolReturn(conn))
DatabaseConnector::dbms(conn)
},

getConnection = function() {
pool::poolCheckout(super$getConnection())
},

#' Close Connection
#' @description
#' Overrides ConnectionHandler Call
Expand All @@ -163,7 +167,7 @@ PooledConnectionHandler <- R6::R6Class(
#' @param sql sql query string
#' @param snakeCaseToCamelCase (Optional) Boolean. return the results columns in camel case (default)
queryFunction = function(sql, snakeCaseToCamelCase = self$snakeCaseToCamelCase) {
conn <- pool::poolCheckout(self$getConnection())
conn <- self$getConnection()
on.exit(pool::poolReturn(conn))
data <- DatabaseConnector::dbGetQuery(conn, sql, translate = FALSE)
if (snakeCaseToCamelCase) {
Expand All @@ -179,7 +183,7 @@ PooledConnectionHandler <- R6::R6Class(
#' Overrides ConnectionHandler Call. Does not translate or render sql.
#' @param sql sql query string
executeFunction = function(sql) {
conn <- pool::poolCheckout(self$getConnection())
conn <- self$getConnection()
on.exit(pool::poolReturn(conn))
DatabaseConnector::dbExecute(conn, sql, translate = FALSE)
}
Expand Down
Loading