Skip to content

Commit

Permalink
Merge pull request #50 from OHDSI/develop
Browse files Browse the repository at this point in the history
Release v0.5.6
  • Loading branch information
azimov authored Dec 18, 2023
2 parents 4a3af3a + 9be6037 commit 3033804
Show file tree
Hide file tree
Showing 35 changed files with 62 additions and 43 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: ResultModelManager
Title: Result Model Manager (RMM) for OHDSI packages
Version: 0.5.5
Version: 0.5.6
Authors@R:
person("Jamie", "Gilbert", , "[email protected]", role = c("aut", "cre"))
Description: Database data model management utilities for OHDSI packages.
Expand Down
8 changes: 8 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@

# ResultModelManager 0.5.6

Changes:

1. For PooledConnectionHandler, added check to see if java stack size is set on unix systems before connecting
stop overflow errors on rconnect platforms. Note that this solution will fail if RJava is called before the connection

# ResultModelManager 0.5.5

Bug Fixes:
Expand Down
6 changes: 6 additions & 0 deletions R/PooledConnectionHandler.R
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ requiredPackage <- function(packageName) {
},
"jdbc" = function(cd) {
ParallelLogger::logInfo("Using DatabaseConnector jdbc driver.")
# Set java stack size on linux to workaround overflow problem
if (is.null(getOption("java.parameters")) & .Platform$OS.type == "linux") {
ParallelLogger::logInfo("Unix system detected and no java.parameters option set. Fixing stack with -Xss5m")
options(java.parameters = "-Xss5m")
}

list(
drv = DatabaseConnector::DatabaseConnectorDriver(),
dbms = cd$dbms,
Expand Down
2 changes: 1 addition & 1 deletion docs/404.html

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

2 changes: 1 addition & 1 deletion docs/LICENSE-text.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/articles/CreatingMigrations.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/ExampleProject.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/articles/PackageDesign.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/articles/UploadFunctionality.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/articles/UsingAnExportManager.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/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/UsingQueryNamespaces.html

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

2 changes: 1 addition & 1 deletion docs/articles/index.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/authors.html

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

2 changes: 1 addition & 1 deletion docs/index.html

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

7 changes: 6 additions & 1 deletion docs/news/index.html

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

2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ articles:
UsingAnExportManager: UsingAnExportManager.html
UsingConnectionHandlers: UsingConnectionHandlers.html
UsingQueryNamespaces: UsingQueryNamespaces.html
last_built: 2023-12-15T00:28Z
last_built: 2023-12-18T17:00Z

2 changes: 1 addition & 1 deletion docs/pull_request_template.html

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

2 changes: 1 addition & 1 deletion docs/reference/ConnectionHandler.html

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

2 changes: 1 addition & 1 deletion docs/reference/DataMigrationManager.html

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

2 changes: 1 addition & 1 deletion docs/reference/PooledConnectionHandler.html

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

2 changes: 1 addition & 1 deletion docs/reference/QueryNamespace.html

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

2 changes: 1 addition & 1 deletion docs/reference/ResultExportManager.html

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

2 changes: 1 addition & 1 deletion docs/reference/ResultModelManager-package.html

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

2 changes: 1 addition & 1 deletion docs/reference/createQueryNamespace.html

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

2 changes: 1 addition & 1 deletion docs/reference/createResultExportManager.html

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

2 changes: 1 addition & 1 deletion docs/reference/deleteAllRowsForDatabaseId.html

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

2 changes: 1 addition & 1 deletion docs/reference/deleteAllRowsForPrimaryKey.html

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

2 changes: 1 addition & 1 deletion docs/reference/generateSqlSchema.html

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

2 changes: 1 addition & 1 deletion docs/reference/grantTablePermissions.html

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

2 changes: 1 addition & 1 deletion docs/reference/index.html

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

Loading

0 comments on commit 3033804

Please sign in to comment.