apply suggestions from code review

r-dbi · Jan 17, 2024 · 7a62336 · 7a62336
1 parent 2833f69
commit 7a62336
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/R/utils.R b/R/utils.R
@@ -145,20 +145,17 @@ compact <- function(x) x[!vapply(x, is.null, logical(1))]
 
 set_odbcsysini <- function() {
   odbcsysini <- Sys.getenv("ODBCSYSINI")
-
   if (!identical(odbcsysini, "")) {
-    return(invisible(TRUE))
-  }
-
-  odbcsysini <- tryCatch(odbcListConfig(), error = function(e) e)
-
-  if (inherits(odbcsysini, "error")) {
-    return(invisible(TRUE))
+    return(invisible())
   }
 
-  odbcsysini <- dirname(odbcsysini[1])
-
-  Sys.setenv(ODBCSYSINI = odbcsysini)
+  tryCatch(
+    {
+      path <- dirname(odbcListConfig()$drivers)
+      Sys.setenv(ODBCSYSINI = path)
+    },
+    error = function(err) NULL
+  )
 
-  invisible(TRUE)
+  invisible()
 }