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
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: odbc
Title: Connect to ODBC Compatible Databases (using the DBI Interface)
Version: 1.7.0.9000
Version: 1.7.1
Authors@R: c(
person("Jim", "Hester", role = "aut"),
person("Hadley", "Wickham", , "hadley@posit.co", role = c("aut", "cre")),
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,5 @@ importFrom(blob,blob)
importFrom(hms,hms)
importFrom(lifecycle,deprecated)
importFrom(utils,packageVersion)
importFrom(vctrs,list_of)
useDynLib(odbc, .registration = TRUE)
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# odbc (development version)
# odbc 1.7.1

* `databricks()` driver auto-detection now recognizes the Windows driver
name `Databricks ODBC Driver`.
Expand Down
3 changes: 3 additions & 0 deletions R/odbc-package.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
#' @importFrom hms hms
#' @importFrom lifecycle deprecated
#' @importFrom Rcpp sourceCpp
# this one is just for the purposes of quieting the R CMD check NOTE,
# which doesn't seem to recognize our vctrs use in setMethod
#' @importFrom vctrs list_of
#' @useDynLib odbc, .registration = TRUE
## usethis namespace: end
NULL
Expand Down
2 changes: 1 addition & 1 deletion vignettes/develop.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ sudo docker run \

The `--platform` tag is correct for M1; if you see `Status: Exited (1)` in Docker Desktop or a warning about incompatible architectures, navigate to `Settings > General` and ensure that `Use Rosetta for x86/amd64 emulation on Apple Silicon` is checked.

To connect via odbc, we need to pass the UID and PWD via the connection string; configuring those arguments via `odbc.ini` is [not permitted](https://stackoverflow.com/questions/42387084/sql-server-odbc-driver-linux-username). With the container deployed as above, the connection arguments would be:
To connect via odbc, we need to pass the UID and PWD via the connection string; configuring those arguments via `odbc.ini` is not permitted (`https://stackoverflow.com/questions/42387084/sql-server-odbc-driver-linux-username`). With the container deployed as above, the connection arguments would be:

```r
con <- dbConnect(
Expand Down
Loading