Merge branch 'develop'

OHDSI · Dec 11, 2023 · bee58a3 · bee58a3
2 parents be58698 + e6860a5
commit bee58a3
Show file tree

Hide file tree

Showing 127 changed files with 147 additions and 102 deletions.
diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
@@ -1,3 +1,3 @@
-Version: 6.3.1
-Date: 2023-11-28 13:06:47 UTC
-SHA: 23e12a103d0553f25c4b14d5f0a9f39d239484d0
+Version: 6.3.2
+Date: 2023-12-11 13:54:30 UTC
+SHA: dd511ec8b23927ffb61a17bedd9ee8bb81cbe476
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: DatabaseConnector
 Type: Package
 Title: Connecting to Various Database Platforms
-Version: 6.3.1
-Date: 2023-11-28
+Version: 6.3.2
+Date: 2023-12-11
 Authors@R: c(
     person("Martijn", "Schuemie", email = "schuemie@ohdsi.org", role = c("aut", "cre")),
     person("Marc", "Suchard", role = c("aut")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,11 @@
+DatabaseConnector 6.3.2
+=======================
+
+Bugfixes:
+
+1. Fixed bug caused in 6.3.1 when Andromeda is not installed.
+
+
 DatabaseConnector 6.3.1
 =======================
 

diff --git a/R/InsertTable.R b/R/InsertTable.R
@@ -218,7 +218,7 @@ insertTable.default <- function(connection,
     )
     tempEmulationSchema <- oracleTempSchema
   }
-  if (Andromeda::isAndromedaTable(data)) {
+  if (is_installed("Andromeda") && Andromeda::isAndromedaTable(data)) {
     warn("Batch-wise uploading of Andromeda tables currently not supported. Loading entire table in memory.",
          .frequency = "regularly",
          .frequency_id = "useMppBulkLoad"

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,10 +1,10 @@
-This update includes 2 bugfixes. (see NEWS.md).
+This update includes 1 bugfix. (see NEWS.md).
 
 ---
 
 ## Test environments
 * Ubuntu 20.04, R 4.3.1
-* Microsoft Windows Server 2016, R 4.2.3
+* MacOS, R 4.2.3
 * MacOS, 4.3.1
 * Windows 10, R 4.3.1
 

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/articles/Connecting.html b/docs/articles/Connecting.html
diff --git a/docs/articles/DbiAndDbplyr.html b/docs/articles/DbiAndDbplyr.html
diff --git a/docs/articles/Querying.html b/docs/articles/Querying.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
@@ -5,5 +5,5 @@ articles:
   Connecting: Connecting.html
   DbiAndDbplyr: DbiAndDbplyr.html
   Querying: Querying.html
-last_built: 2023-11-28T09:55Z
+last_built: 2023-12-11T11:09Z
 
diff --git a/docs/pull_request_template.html b/docs/pull_request_template.html
diff --git a/docs/reference/DatabaseConnector-package.html b/docs/reference/DatabaseConnector-package.html
diff --git a/docs/reference/DatabaseConnectorDbiResult-class.html b/docs/reference/DatabaseConnectorDbiResult-class.html
diff --git a/docs/reference/DatabaseConnectorDriver-class.html b/docs/reference/DatabaseConnectorDriver-class.html
diff --git a/docs/reference/DatabaseConnectorDriver.html b/docs/reference/DatabaseConnectorDriver.html
diff --git a/docs/reference/DatabaseConnectorJdbcResult-class.html b/docs/reference/DatabaseConnectorJdbcResult-class.html
diff --git a/docs/reference/assertTempEmulationSchemaSet.html b/docs/reference/assertTempEmulationSchemaSet.html
diff --git a/docs/reference/computeDataHash.html b/docs/reference/computeDataHash.html
diff --git a/docs/reference/connect.html b/docs/reference/connect.html
diff --git a/docs/reference/createConnectionDetails.html b/docs/reference/createConnectionDetails.html
diff --git a/docs/reference/createDbiConnectionDetails.html b/docs/reference/createDbiConnectionDetails.html
diff --git a/docs/reference/createZipFile.html b/docs/reference/createZipFile.html
diff --git a/docs/reference/dateAdd.html b/docs/reference/dateAdd.html
diff --git a/docs/reference/dateDiff.html b/docs/reference/dateDiff.html
diff --git a/docs/reference/dateFromParts.html b/docs/reference/dateFromParts.html
diff --git a/docs/reference/day.html b/docs/reference/day.html
diff --git a/docs/reference/dbAppendTable-DatabaseConnectorConnection-character-method.html b/docs/reference/dbAppendTable-DatabaseConnectorConnection-character-method.html
diff --git a/docs/reference/dbClearResult-DatabaseConnectorDbiResult-method.html b/docs/reference/dbClearResult-DatabaseConnectorDbiResult-method.html
diff --git a/docs/reference/dbClearResult-DatabaseConnectorJdbcResult-method.html b/docs/reference/dbClearResult-DatabaseConnectorJdbcResult-method.html
diff --git a/docs/reference/dbColumnInfo-DatabaseConnectorDbiResult-method.html b/docs/reference/dbColumnInfo-DatabaseConnectorDbiResult-method.html
diff --git a/docs/reference/dbColumnInfo-DatabaseConnectorJdbcResult-method.html b/docs/reference/dbColumnInfo-DatabaseConnectorJdbcResult-method.html
diff --git a/docs/reference/dbConnect-DatabaseConnectorDriver-method.html b/docs/reference/dbConnect-DatabaseConnectorDriver-method.html
diff --git a/docs/reference/dbCreateTable-DatabaseConnectorConnection-method.html b/docs/reference/dbCreateTable-DatabaseConnectorConnection-method.html
diff --git a/docs/reference/dbDisconnect-DatabaseConnectorConnection-method.html b/docs/reference/dbDisconnect-DatabaseConnectorConnection-method.html