Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# odbc (development version)

* `databricks()` driver auto-detection now recognizes the Windows driver
name `Databricks ODBC Driver`.

* `databricks()` now sets `DefaultStringColumnLength` to 65535 by default.
The driver reports `STRING` columns as `VARCHAR(DefaultStringColumnLength)`
and silently truncates longer values; its own default of 255 caused string
Expand Down
6 changes: 5 additions & 1 deletion R/driver-databricks.R
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,11 @@ databricks_default_args <- function(driver, host, httpPath, useNativeQuery) {
databricks_default_driver <- function() {
find_default_driver(
databricks_default_driver_paths(),
fallbacks = c("Databricks", "Simba Spark ODBC Driver"),
fallbacks = c(
"Databricks",
"Databricks ODBC Driver",
"Simba Spark ODBC Driver"
),
label = "Databricks/Spark",
call = quote(DBI::dbConnect())
)
Expand Down
8 changes: 8 additions & 0 deletions tests/testthat/test-driver-databricks.R
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ test_that("fallbacks to driver name", {
expect_equal(databricks_default_driver(), "Databricks")
})

test_that("fallbacks to updated Windows driver name (#1030)", {
local_mocked_bindings(
databricks_default_driver_paths = function() character(),
odbcListDrivers = function() list(name = c("bar", "Databricks ODBC Driver"))
)
expect_equal(databricks_default_driver(), "Databricks ODBC Driver")
})

test_that("errors if can't find driver", {
local_mocked_bindings(
databricks_default_driver_paths = function() character(),
Expand Down
Loading