Merge pull request #45 from OHDSI/develop

Release 0.5.3
OHDSI · Nov 9, 2023 · d457b19 · d457b19
2 parents 7320896 + e8dd8ad
commit d457b19
Show file tree

Hide file tree

Showing 38 changed files with 100 additions and 56 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: ResultModelManager
 Title: Result Model Manager (RMM) for OHDSI packages
-Version: 0.5.2
+Version: 0.5.3
 Authors@R:
     person("Jamie", "Gilbert", , "[email protected]", role = c("aut", "cre"))
 Description: Database data model management utilities for OHDSI packages.
@@ -23,6 +23,7 @@ Imports:
   readr,
   zip,
   dplyr,
+  dbplyr,
   rlang,
   lubridate,
   fastmap

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,15 @@
+# ResultModelManager 0.5.3
+
+Changes:
+
+1. Tests for PooledConnection classes
+
+Bug Fixes:
+
+1. Use of RPostgres updated.
+
+2. Use of dbplyr::in_schema for using dplyr::tbl in ConnectionHandlers
+
 # ResultModelManager 0.5.2
 
 Changes:

diff --git a/R/ConnectionHandler.R b/R/ConnectionHandler.R
@@ -68,7 +68,7 @@ ConnectionHandler <- R6::R6Class(
       checkmate::assertString(table)
       checkmate::assertString(databaseSchema, null.ok = TRUE)
       if (!is.null(databaseSchema)) {
-        table <- paste0(databaseSchema, ".", table)
+        table <- dbplyr::in_schema(databaseSchema, table)
       }
 
       dplyr::tbl(self$getConnection(), table)

diff --git a/R/PooledConnectionHandler.R b/R/PooledConnectionHandler.R
@@ -37,7 +37,7 @@ requiredPackage <- function(packageName) {
     host <- strsplit(cd$server(), "/")[[1]][1]
     dbname <- strsplit(cd$server(), "/")[[1]][2]
     list(
-      drv = RPostgres::PostgreSQL(),
+      drv = RPostgres::Postgres(),
       dbname = dbname,
       host = host,
       user = cd$user(),
@@ -57,12 +57,12 @@ requiredPackage <- function(packageName) {
     ParallelLogger::logInfo("Reverting to use of DatabaseConnector jdbc driver. May fail on some systems")
     list(
       drv = DatabaseConnector::DatabaseConnectorDriver(),
-      dbms = cd$connectionDetails$dbms,
-      server = cd$connectionDetails$server(),
-      port = cd$connectionDetails$port(),
-      user = cd$connectionDetails$user(),
-      password = cd$connectionDetails$password(),
-      connectionString = cd$connectionDetails$connectionString()
+      dbms = cd$dbms,
+      server = cd$server(),
+      port = cd$port(),
+      user = cd$user(),
+      password = cd$password(),
+      connectionString = cd$connectionString()
     )
   }
 )

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/CreatingMigrations.html b/docs/articles/CreatingMigrations.html
diff --git a/docs/articles/ExampleProject.html b/docs/articles/ExampleProject.html
diff --git a/docs/articles/PackageDesign.html b/docs/articles/PackageDesign.html
diff --git a/docs/articles/UploadFunctionality.html b/docs/articles/UploadFunctionality.html
diff --git a/docs/articles/UsingAnExportManager.html b/docs/articles/UsingAnExportManager.html
diff --git a/docs/articles/UsingConnectionHandlers.html b/docs/articles/UsingConnectionHandlers.html
diff --git a/docs/articles/UsingQueryNamespaces.html b/docs/articles/UsingQueryNamespaces.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -9,5 +9,5 @@ articles:
   UsingAnExportManager: UsingAnExportManager.html
   UsingConnectionHandlers: UsingConnectionHandlers.html
   UsingQueryNamespaces: UsingQueryNamespaces.html
-last_built: 2023-11-08T13:33Z
+last_built: 2023-11-09T14:48Z
 
diff --git a/docs/pull_request_template.html b/docs/pull_request_template.html
diff --git a/docs/reference/ConnectionHandler.html b/docs/reference/ConnectionHandler.html
diff --git a/docs/reference/DataMigrationManager.html b/docs/reference/DataMigrationManager.html
diff --git a/docs/reference/PooledConnectionHandler.html b/docs/reference/PooledConnectionHandler.html
diff --git a/docs/reference/QueryNamespace.html b/docs/reference/QueryNamespace.html
diff --git a/docs/reference/ResultExportManager.html b/docs/reference/ResultExportManager.html
diff --git a/docs/reference/ResultModelManager-package.html b/docs/reference/ResultModelManager-package.html
diff --git a/docs/reference/createQueryNamespace.html b/docs/reference/createQueryNamespace.html
diff --git a/docs/reference/createResultExportManager.html b/docs/reference/createResultExportManager.html
diff --git a/docs/reference/deleteAllRowsForDatabaseId.html b/docs/reference/deleteAllRowsForDatabaseId.html