v1.6.1 release candidate (#903)

* update NEWS
* update cran comments
* skip dependent tests without unixodbc
* Increment version number to 1.6.1

Author: simonpcouch

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: odbc
 Title: Connect to ODBC Compatible Databases (using the DBI Interface)
-Version: 1.6.0.9000
+Version: 1.6.1
 Authors@R: c(
     person("Jim", "Hester", role = "aut"),
     person("Hadley", "Wickham", , "[email protected]", role = c("aut", "cre")),

NEWS.md

@@ -1,4 +1,7 @@
-# odbc (development version)
+# odbc 1.6.1
+
+* odbc will now automatically find statically built installations of
+  unixodbc (#899).
 
 # odbc 1.6.0
 

cran-comments.md

@@ -1,11 +1,12 @@
+Trying again - I think we should now be passing on M1mac. Sorry for the multiple attempts here but something is configured in an unexpected way on that system and we're having a hard time replicating locally.
+
 ## R CMD check results
 
-Recent MacOS builds trigger the NOTE "installed size is 10.8Mb." MacOS builds include all debug symbols and CRAN policy doesn't permit building without them.
+Recent MacOS builds trigger the NOTE "installed size is 11.0Mb." MacOS builds include all debug symbols and CRAN policy doesn't permit building without them.
 
 ## revdepcheck results
 
 We checked 35 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
 
  * We saw 0 new problems
  * We failed to check 0 packages
-

tests/testthat/helper.R

@@ -30,6 +30,12 @@ skip_if_no_drivers <- function() {
   }
 }
 
+skip_if_no_unixodbc <- function() {
+  if (!is_windows() && length(locate_install_unixodbc()) == 0) {
+    skip("No unixodbc installation found.")
+  }
+}
+
 #' Test round tripping a simple table
 #'
 #' This tests all the supported data types, including missing values. It first

tests/testthat/test-dbi-connection.R

@@ -27,6 +27,7 @@ test_that("show method does not print server if it is not available", {
 })
 
 test_that("dbQuoteIdentifier() errors informatively", {
+  skip_if_no_unixodbc()
   con <- test_con("SQLITE")
 
   expect_snapshot(

tests/testthat/test-driver-mysql.R

@@ -1,3 +1,5 @@
+skip_if_no_unixodbc()
+
 test_that("MySQL", {
   DBItest::make_context(
     odbc(),

tests/testthat/test-driver-oracle.R

@@ -1,3 +1,5 @@
+skip_if_no_unixodbc()
+
 test_that("Oracle", {
   DBItest::make_context(
     odbc(),

tests/testthat/test-driver-postgres.R

@@ -1,3 +1,5 @@
+skip_if_no_unixodbc()
+
 test_that("PostgreSQL", {
   DBItest::make_context(
     odbc(),
@@ -164,4 +166,3 @@ test_that("odbcPreviewObject", {
   })
   expect_equal(nrow(res), 3)
 })
-

tests/testthat/test-driver-sql-server.R

@@ -1,3 +1,5 @@
+skip_if_no_unixodbc()
+
 test_that("SQLServer", {
   DBItest::make_context(
     odbc(),

tests/testthat/test-driver-sqlite.R

@@ -1,3 +1,5 @@
+skip_if_no_unixodbc()
+
 test_that("SQLite", {
   DBItest::make_context(
     odbc(),

tests/testthat/test-odbc-connection.R

@@ -66,6 +66,7 @@ test_that("automatically picks correct quote type", {
 
 # connections pane -------------------------------------------------------------
 test_that("validateObjectName() errors informatively", {
+  skip_if_no_unixodbc()
   con <- test_con("SQLITE")
 
   expect_snapshot(
@@ -82,6 +83,7 @@ test_that("validateObjectName() errors informatively", {
 # odbcConnectionColumns deprecation --------------------------------------
 
 test_that("odbcConnectionColumns warns on usage (#699)", {
+  skip_if_no_unixodbc()
   con <- test_con("SQLITE")
   lifecycle::expect_deprecated(odbcConnectionColumns(con, "test"))
 })

tests/testthat/test-utils.R

@@ -117,6 +117,7 @@ test_that("set_odbcsysini() works (#791)", {
 })
 
 test_that("check_row.names()", {
+  skip_if_no_unixodbc()
   con <- test_con("SQLITE")
 
   expect_snapshot(
@@ -126,6 +127,7 @@ test_that("check_row.names()", {
 })
 
 test_that("check_field.types()", {
+  skip_if_no_unixodbc()
   con <- test_con("SQLITE")
 
   expect_snapshot(
@@ -135,6 +137,7 @@ test_that("check_field.types()", {
 })
 
 test_that("check_attributes()", {
+  skip_if_no_unixodbc()
   expect_snapshot(
     error = TRUE,
     con <- test_con("SQLITE", attributes = list(boop = "bop"))
@@ -175,6 +178,9 @@ test_that("locate_install_unixodbc() returns reasonable values", {
   skip_if(!is_macos())
   skip_if(!has_unixodbc(), "odbcinst not available.")
 
+  # odbc_config / pkg-config cflags point to nonexistent files on CRAN (#903)
+  skip_on_cran()
+
   res <- locate_install_unixodbc()
 
   expect_true(file.exists(res[1]))