diff --git a/DESCRIPTION b/DESCRIPTION index 81b50c8c..52797690 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -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")), diff --git a/NAMESPACE b/NAMESPACE index b73174e3..c16d4d2a 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -90,4 +90,5 @@ importFrom(blob,blob) importFrom(hms,hms) importFrom(lifecycle,deprecated) importFrom(utils,packageVersion) +importFrom(vctrs,list_of) useDynLib(odbc, .registration = TRUE) diff --git a/NEWS.md b/NEWS.md index 0263157a..a7349e49 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# odbc (development version) +# odbc 1.7.1 * `databricks()` driver auto-detection now recognizes the Windows driver name `Databricks ODBC Driver`. diff --git a/R/odbc-package.R b/R/odbc-package.R index 4ca2e815..43f0f684 100644 --- a/R/odbc-package.R +++ b/R/odbc-package.R @@ -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 diff --git a/vignettes/develop.Rmd b/vignettes/develop.Rmd index 90cca1e9..71b81811 100644 --- a/vignettes/develop.Rmd +++ b/vignettes/develop.Rmd @@ -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(