Merge pull request #265 from r-dbi/f-dbi-arrow

DESCRIPTION

@@ -55,7 +55,9 @@ RoxygenNote: 7.2.1
 Collate: 
     'DBItest.R'
     'context.R'
+    'dbi.R'
     'expectations.R'
+    'generics.R'
     'import-dbi.R'
     'import-testthat.R'
     'run.R'

R/dbi.R

@@ -0,0 +1,48 @@
+fetch_dbi_generics <- function() {
+  dbi <- asNamespace("DBI")
+
+  dbi_generics <- grep("^[.]__T__db", getNamespaceExports(dbi), value = TRUE)
+  clean_dbi_generics <- gsub("^[.]__T__(.*):DBI$", "\\1", dbi_generics)
+  active_dbi_generics <- setdiff(clean_dbi_generics, c(
+    "dbDriver",
+    "dbUnloadDriver",
+    "dbListConnections",
+    "dbListResults",
+    "dbSetDataMappings",
+    "dbGetException",
+    "dbCallProc",
+    "dbGetConnectArgs"
+  ))
+  dbi_names <- sort(c(active_dbi_generics, "Id"))
+  dbi_names
+}
+
+create_generics <- function() {
+  dbi_names <- fetch_dbi_generics()
+  text <- paste0(
+    "# Created by create_generics(), do not edit by hand\nall_dbi_generics <- function() {\n  c(\n",
+    paste0('    "', dbi_names, '",\n', collapse = ""),
+    "    NULL\n  )\n}"
+  )
+  writeLines(text, "R/generics.R")
+}
+
+dbi_generics <- function(version) {
+  version <- as.package_version(version)
+
+  generics <- all_dbi_generics()
+
+  if (version < as.package_version("1.7.3")) {
+    generics <- setdiff(generics, c(
+      "dbGetStream",
+      "dbAppendStream",
+      "dbStream",
+      "dbWriteStream",
+      "dbSendQueryStream",
+      "dbStreamTable",
+      "dbCreateFromStream"
+    ))
+  }
+
+  generics
+}

R/generics.R

@@ -0,0 +1,50 @@
+# Created by create_generics(), do not edit by hand
+all_dbi_generics <- function() {
+  c(
+    "dbAppendStream",
+    "dbAppendTable",
+    "dbBegin",
+    "dbBind",
+    "dbCanConnect",
+    "dbClearResult",
+    "dbColumnInfo",
+    "dbCommit",
+    "dbConnect",
+    "dbCreateFromStream",
+    "dbCreateTable",
+    "dbDataType",
+    "dbDisconnect",
+    "dbExecute",
+    "dbExistsTable",
+    "dbFetch",
+    "dbGetInfo",
+    "dbGetQuery",
+    "dbGetRowCount",
+    "dbGetRowsAffected",
+    "dbGetStatement",
+    "dbGetStream",
+    "dbHasCompleted",
+    "dbIsReadOnly",
+    "dbIsValid",
+    "dbListFields",
+    "dbListObjects",
+    "dbListTables",
+    "dbQuoteIdentifier",
+    "dbQuoteLiteral",
+    "dbQuoteString",
+    "dbReadTable",
+    "dbRemoveTable",
+    "dbRollback",
+    "dbSendQuery",
+    "dbSendQueryStream",
+    "dbSendStatement",
+    "dbStream",
+    "dbStreamTable",
+    "dbUnquoteIdentifier",
+    "dbWithTransaction",
+    "dbWriteStream",
+    "dbWriteTable",
+    "Id",
+    NULL
+  )
+}

R/spec-compliance-methods.R

@@ -52,22 +52,8 @@ spec_compliance_methods <- list(
     pkg <- package_name(ctx)
 
     where <- asNamespace(pkg)
-    dbi <- asNamespace("DBI")
-
-    dbi_generics <- grep("^[.]__T__db", getNamespaceExports(dbi), value = TRUE)
-    . <- gsub("^[.]__T__(.*):DBI$", "\\1", dbi_generics)
-    . <- setdiff(., c(
-      "dbDriver",
-      "dbUnloadDriver",
-      "dbListConnections",
-      "dbListResults",
-      "dbSetDataMappings",
-      "dbGetException",
-      "dbCallProc",
-      "dbGetConnectArgs"
-    ))
-    . <- c(., "Id")
-    dbi_names <- .
+
+    dbi_names <- dbi_generics(ctx$tweaks$dbitest_version)
 
     # Suppressing warning "... may not be available when loading"
     exported_names <- suppressWarnings(callr::r(

tests/testthat/test-dbi.R

@@ -0,0 +1,5 @@
+test_that("Exported DBI methods as expected", {
+  skip_if_not_installed("DBI", "1.1.3.9002")
+
+  expect_equal(all_dbi_generics(), fetch_dbi_generics())
+})