Merge pull request #71 from OHDSI/develop

Release 0.5.11
OHDSI · Sep 23, 2024 · dee78e2 · dee78e2
2 parents c734b7e + 09bd4e4
commit dee78e2
Show file tree

Hide file tree

Showing 39 changed files with 79 additions and 73 deletions.
diff --git a/.github/workflows/R_CMD_check_Hades.yml b/.github/workflows/R_CMD_check_Hades.yml
@@ -86,7 +86,7 @@ jobs:
 
       - name: Upload source package
         if: success() && runner.os == 'macOS' && github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: package_tarball
           path: check/*.tar.gz

diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
@@ -1,3 +1,3 @@
-Version: 0.5.10
-Date: 2024-08-21 04:10:48 UTC
-SHA: bb001b6745dfbc303db44ef96b9eb8aaa2f67901
+Version: 0.5.11
+Date: 2024-09-18 17:05:03 UTC
+SHA: cf95c8b339e484e2c0e3889d6537100516e9600c
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: ResultModelManager
 Title: Result Model Manager
-Version: 0.5.10
+Version: 0.5.11
 Authors@R:
     person("Jamie", "Gilbert", , "[email protected]", role = c("aut", "cre"))
 Description: Database data model management utilities for R packages in the Observational Health Data Sciences and

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+# ResultModelManager 0.5.11
+
+Changes:
+
+1. Refactor of tests to accommodate cran
+
 # ResultModelManager 0.5.10
 
 Changes:

diff --git a/R/DataModel.R b/R/DataModel.R
@@ -472,7 +472,7 @@ uploadTable <- function(tableName,
         table_name = env$tableName
       )
       primaryKeyValuesInDb <-
-        DatabaseConnector::querySql(connection, sql)
+        DatabaseConnector::querySql(connection, sql, integer64AsNumeric = TRUE)
       colnames(primaryKeyValuesInDb) <-
         tolower(colnames(primaryKeyValuesInDb))
       env$primaryKeyValuesInDb <- primaryKeyValuesInDb

diff --git a/R/QueryNamespace.R b/R/QueryNamespace.R
@@ -219,7 +219,10 @@ QueryNamespace <- R6::R6Class(
     #' @description
     #' Close connections etc
     finalize = function() {
-      private$connectionHandler$finalize()
+      if (!is.null(private$connectionHandler)) {
+        private$connectionHandler$finalize()
+        private$connectionHandler <- NULL
+      }
       invisible(NULL)
     }
   )

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,4 +9,4 @@ articles:
   UsingAnExportManager: UsingAnExportManager.html
   UsingConnectionHandlers: UsingConnectionHandlers.html
   UsingQueryNamespaces: UsingQueryNamespaces.html
-last_built: 2024-08-13T18:18Z
+last_built: 2024-09-18T16:35Z
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