merge upstream

`odbcListConfig()` now lives in `odbc-config.R`

Merge branch 'main' into odbcListConfig

# Conflicts:
#	NEWS.md
#	R/Connection.R

.Rbuildignore

@@ -26,7 +26,6 @@
 ^revdep$
 ^testing$
 ^CRAN-RELEASE$
-^setup.md$
 ^inst/diagrams\.key$
 ^man/figures/r-interface\.png$
 ^\.github/workflows/R-CMD-check\.yaml$

DESCRIPTION

@@ -47,16 +47,38 @@ Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.2.3
 SystemRequirements: GNU make, An ODBC3 driver manager and drivers.
 Collate: 
- 'odbc.R'
- 'Driver.R'
- 'Connection.R'
- 'DataTypes.R'
  'RcppExports.R'
- 'Result.R'
- 'Table.R'
- 'Viewer.R'
- 'databricks.R'
+ 'connection-pane.R'
+ 'dbi-connection.R'
+ 'odbc-connection.R'
  'db.R'
+ 'dbi-driver.R'
+ 'dbi-result.R'
+ 'dbi-table.R'
+ 'dbi.R'
+ 'driver-access.R'
+ 'driver-bigquery.R'
+ 'driver-databricks.R'
+ 'driver-db2.R'
+ 'driver-hana.R'
+ 'driver-hive.R'
+ 'driver-impala.R'
+ 'driver-mysql.R'
+ 'driver-oracle.R'
+ 'driver-postgres.R'
+ 'driver-redshift.R'
+ 'driver-snowflake.R'
+ 'driver-spark.R'
+ 'driver-sql-server.R'
+ 'driver-sqlite.R'
+ 'driver-teradata.R'
+ 'driver-vertica.R'
+ 'odbc-config.R'
+ 'odbc-data-sources.R'
+ 'odbc-data-type.R'
+ 'odbc-drivers.R'
+ 'odbc-package.R'
+ 'odbc.R'
  'utils.R'
  'zzz.R'
 VignetteBuilder: knitr

MAINTENANCE.md

@@ -4,7 +4,7 @@ odbc is stable, though there are still corner cases where it could have issues w
 
 ## Known outstanding issues
 
-https://github.com/r-dbi/odbc/blob/main/setup.md contains instructions on running the tests locally, which is important to make the feedback loop shorter.
+The "Developing odbc" vignette at `vignette("develop")` contains instructions on running the tests locally, which is important to make the feedback loop shorter.
 
 The hardest part of maintaining odbc is often an issue only occurs with a specific database, and setting up the environment for that database usually takes a non-trivial amount of time.
 

NEWS.md

@@ -1,47 +1,58 @@
 # odbc (development version)
 
-* Added a function `odbcListConfig()` to help locate configuration files on
- macOS and Linux (@simonpcouch, #565).
+## Major changes
+
+* New `odbc::databricks()` makes it easier to connect to Databricks, 
+ automatically handling many common authentication scenarios (@atheriel, #615).
+
+* `dbListTables()`, `dbListFields()` and `dbExistsTable()` automatically
+ escape underscores in identifier arguments. This leads to substantial 
+ performance improvements for some backends (e.g. snowflake) 
+ (@detule, @fh-afrachioni, #618).
 
 * `dbGetQuery()` and `dbSendQuery()` now set `immediate = TRUE` if you are 
  not using a parameterised query. That should yield a small speed boost in 
  many cases (#633).
 
-* Using odbc with SQL Server no longer leads to warnings about ambiguous
- method dispatch (#661).
+## Minor improvements and bug fixes
+
+* Added a function `odbcListConfig()` to help locate configuration files on
+ macOS and Linux (@simonpcouch, #565).
+
+* Increased the minimum required R version from 3.2.0 to 3.6.0 
+ (@simonpcouch, #629).
 
 * S4 classes for the most database drivers are now exported, make it possible
  to use in other packages (#558).
 
 * ODBC errors are now spread across multiple lines, making them easier to 
  read (@detule, #564).
 
-* `dbListTables()`, `dbListFields()` and `dbExistsTable()` automatically
- escape underscores in identifier arguments. This leads to substantial 
- performance improvements for some backends (e.g. snowflake) 
- (@detule, @fh-afrachioni, #618).
-
 * `DBI::dbConnect(odbc::odbc())` now gives a clear error if you supply multiple
  arguments with the same name when case is ignored (#641).
 
-* `dbConnect(odbc::odbc())` now automatically quotes argument values that need 
+* `DBI::dbConnect(odbc::odbc())` now automatically quotes argument values that need 
  it (#616).
 
-* Spark SQL: Correctly enumerate schemas away from the current catalog (@detule, #614)
-* Modify `odbcDataType.Snowflake` to better reflect Snowflake Data Types documentation (@meztez, #599).
-* SQL Server: Specialize syntax in sqlCreateTable to avoid failures when
- writing to (new) local temp tables. (@detule, #601)
-* SQL Server: Improved handling for local temp tables in dbWrite, dbAppendTable,
- dbExistTable (@detule, #600)
-* Teradata: Improved handling for temp tables (@detule and @But2ene, #589, 590)
-* Oracle: Fix regression when falling back to odbcConnectionColumns to
+## Driver specific changes
+
+* Oracle: Fix regression when falling back to `odbcConnectionColumns()` to
  describe column data types (@detule, #587)
 
-* Add a new, specialised `odbc::databricks()` class with its own `dbConnect()`
- method to make using Databricks's ODBC driver easier (@atheriel, #615).
-* Increased the minimum required R version from 3.2.0 to 3.6.0 (@simonpcouch, #629).
-* Add support for searching multiple paths for the default location of the
- Databricks driver (@bschwedler, #621).
+* Spark SQL: Correctly enumerate schemas away from the current catalog 
+ (@detule, #614)
+
+* Snowflake: improved translation from R to snowflake types (@meztez, #599).
+
+* SQL Server
+
+ * Improved handling for local temp tables in `dbWrite()`, `dbAppendTable()`,
+ and `dbExistTable()` (@detule, #600)
+
+ * Specialize syntax in `sqlCreateTable` to avoid failures when
+ writing to (new) local temp tables. (@detule, #601)
+
+* Teradata: Improved handling for temp tables (@detule and @But2ene, #589, 590)
 
 # odbc 1.3.5