From 22a45f10c5060b250246993f9bb758a40ea1ba1c Mon Sep 17 00:00:00 2001 From: jgilber2 Date: Wed, 1 Oct 2025 16:51:14 -0700 Subject: [PATCH 1/3] Fix for ignoring package prefix in migration exec --- R/DataMigrationManager.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/DataMigrationManager.R b/R/DataMigrationManager.R index b4bd932..c5af333 100644 --- a/R/DataMigrationManager.R +++ b/R/DataMigrationManager.R @@ -110,7 +110,7 @@ DataMigrationManager <- R6::R6Class( #' @return boolean migrationTableExists = function() { tables <- DatabaseConnector::getTableNames(private$connectionHandler$getConnection(), self$databaseSchema) - return(tolower(paste0(self$tablePrefix, "migration")) %in% tables) + return(tolower(paste0(self$tablePrefix, self$packageTablePrefix, "migration")) %in% tables) }, #' Get path of migrations From 68cfd843685c8ebc965195c6bb64ad8bccca722d Mon Sep 17 00:00:00 2001 From: jgilber2 Date: Wed, 1 Oct 2025 16:55:59 -0700 Subject: [PATCH 2/3] Package maintenance --- DESCRIPTION | 2 +- NEWS.md | 7 +++++++ docs/404.html | 4 ++-- docs/LICENSE-text.html | 4 ++-- docs/articles/CreatingMigrations.html | 6 +++--- docs/articles/ExampleProject.html | 8 ++++---- docs/articles/PackageDesign.html | 6 +++--- docs/articles/UploadFunctionality.html | 6 +++--- docs/articles/UsingAnExportManager.html | 6 +++--- docs/articles/UsingConnectionHandlers.html | 6 +++--- docs/articles/UsingPythonUploads.html | 6 +++--- docs/articles/UsingQueryNamespaces.html | 8 ++++---- docs/articles/index.html | 4 ++-- docs/authors.html | 8 ++++---- docs/index.html | 4 ++-- docs/news/index.html | 11 ++++++++--- docs/pkgdown.yml | 2 +- docs/reference/ConnectionHandler.html | 4 ++-- docs/reference/DataMigrationManager.html | 4 ++-- docs/reference/PooledConnectionHandler.html | 4 ++-- docs/reference/QueryNamespace.html | 6 +++--- docs/reference/ResultExportManager.html | 4 ++-- .../reference/ResultModelManager-package.html | 4 ++-- docs/reference/createQueryNamespace.html | 4 ++-- docs/reference/createResultExportManager.html | 4 ++-- .../reference/deleteAllRowsForDatabaseId.html | 4 ++-- .../reference/deleteAllRowsForPrimaryKey.html | 4 ++-- docs/reference/disablePythonUploads.html | 4 ++-- docs/reference/enablePythonUploads.html | 4 ++-- docs/reference/generateSqlSchema.html | 4 ++-- docs/reference/grantTablePermissions.html | 4 ++-- docs/reference/index.html | 4 ++-- docs/reference/install_psycopg2.html | 4 ++-- .../loadResultsDataModelSpecifications.html | 4 ++-- docs/reference/pyPgUploadEnabled.html | 4 ++-- docs/reference/pyUploadCsv.html | 4 ++-- docs/reference/pyUploadDataFrame.html | 4 ++-- docs/reference/unzipResults.html | 4 ++-- docs/reference/uploadResults.html | 4 ++-- docs/search.json | 2 +- extras/ResultModelManager.pdf | Bin 135464 -> 135463 bytes tests/testthat/setup.R | 1 - 42 files changed, 101 insertions(+), 90 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index c2b2d7f..09dcf56 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: ResultModelManager Title: Result Model Manager -Version: 0.6.1 +Version: 0.6.2 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 diff --git a/NEWS.md b/NEWS.md index 243c1a3..1eb3b2e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,10 @@ +# ResultModelManager 0.6.2 + +Bug Fixes: + +1. Resolved issue with migration status check failing on packages using a table prefix (e.g. cohort generator) + + # ResultModelManager 0.6.1 Bug Fixes: diff --git a/docs/404.html b/docs/404.html index fb3de89..fc1dc75 100644 --- a/docs/404.html +++ b/docs/404.html @@ -20,7 +20,7 @@ ResultModelManager - 0.6.1 + 0.6.2