Skip to content

databricks/snowflake: fixup *simba_config so that return value is sam… #911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
detule merged 3 commits into from
Apr 27, 2025
Merged

databricks/snowflake: fixup *simba_config so that return value is sam… #911

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
052948d
databricks/snowflake: fixup *simba_config so that return value is sam…
detule Apr 5, 2025
729ffde
Add NEWS item
detule Apr 27, 2025
100bf10
Merge branch 'main' into bugfix/simba_config
detule Apr 27, 2025
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
5 changes: 3 additions & 2 deletions R/driver-databricks.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,9 @@ workbench_databricks_token <- function(host, cfg_file) {
# p. 44 https://downloads.datastax.com/odbc/2.6.5.1005/Simba%20Spark%20ODBC%20Install%20and%20Configuration%20Guide.pdf
spark_simba_config <- function(driver) {
spark_env <- Sys.getenv("SIMBASPARKINI")
URL <- "https://www.databricks.com/spark/odbc-drivers-download"
if (!identical(spark_env, "")) {
return(spark_env)
return(list(path = spark_env, url = URL))
}
common_dirs <- c(
driver_dir(driver),
Expand All @@ -358,6 +359,6 @@ spark_simba_config <- function(driver) {
common_dirs,
pattern = "simba\\.sparkodbc\\.ini$",
full.names = TRUE),
url = "https://www.databricks.com/spark/odbc-drivers-download"
url = URL
))
}
5 changes: 3 additions & 2 deletions R/driver-snowflake.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,9 @@ snowflake_default_driver_paths <- function() {

snowflake_simba_config <- function(driver) {
snowflake_env <- Sys.getenv("SIMBASNOWFLAKEINI")
URL <- "https://docs.snowflake.com/en/developer-guide/odbc/odbc-download"
if (!identical(snowflake_env, "")) {
return(snowflake_env)
return(list(path = snowflake_env, url = URL))
}
# Posit configuration is likely at:
# /opt/snowflake-osx-x64/bin/lib/rstudio.snowflakeodbc.ini
Expand All @@ -292,7 +293,7 @@ snowflake_simba_config <- function(driver) {
simba_config_dirs(driver),
pattern = "snowflake(odbc)?\\.ini$",
full.names = TRUE),
url = "https://docs.snowflake.com/en/developer-guide/odbc/odbc-download"
url = URL
))
}

Expand Down
Loading