Merge pull request #254 from egillax/duckdb_pathToDriver

Duckdb path to driver
OHDSI · Oct 21, 2023 · c0d05d6 · c0d05d6
2 parents 20c66bd + 57dbb72
commit c0d05d6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/R/Drivers.R b/R/Drivers.R
@@ -162,7 +162,7 @@ getJbcDriverSingleton <- function(driverClass = "", classPath = "") {
 }
 
 checkPathToDriver <- function(pathToDriver, dbms) {
-  if (!is.null(dbms) && dbms %in% c("sqlite", "sqlite extended")) {
+  if (!is.null(dbms) && dbms %in% c("sqlite", "sqlite extended", "duckdb")) {
     return()
   }
   if (pathToDriver == "") {

diff --git a/tests/testthat/test-duckdb.R b/tests/testthat/test-duckdb.R
@@ -9,6 +9,20 @@ test_that("Open and close duckdb connection", {
   unlink(databaseFile)
 })
 
+test_that("Open and close duckdb without DATABASECONNECTOR_JAR_FOLDER", {
+  withr::with_envvar(
+    new=c("DATABASECONNECTOR_JAR_FOLDER"=""),
+    {
+    databaseFile <- tempfile()
+    connection <- DatabaseConnector::connect(dbms = "duckdb", server = databaseFile)
+    expect_s4_class(connection, "DatabaseConnectorDbiConnection")
+    disconnect(connection)
+    unlink(databaseFile)
+    }
+
+  )
+})
+
 test_that("Insert and retrieve dates from duckdb", {
   databaseFile <- tempfile()
   connection <- DatabaseConnector::connect(dbms = "duckdb", server = databaseFile)