Create src_ classes from DBI class extensions

NEWS.md

@@ -1,5 +1,8 @@
 # dbplyr (development version)
 
+* The class of remote sources now includes all S4 class names, not just
+  the first (#918).
+
 * `db_explain()` now works for Oracle (@thomashulst, #1353).
 
 * Database errors now show the generated SQL, which hopefully will make it

R/src_dbi.R

@@ -123,17 +123,20 @@ src_dbi <- function(con, auto_disconnect = FALSE) {
     disco <- db_disconnector(con, quiet = is_true(auto_disconnect)) # nocov
   }
 
-  subclass <- paste0("src_", class(con)[[1]])
-
   structure(
     list(
       con = con,
       disco = disco
     ),
-    class = c(subclass, "src_dbi", "src_sql", "src")
+    class = connection_s3_class(con)
   )
 }
 
+connection_s3_class <- function(con) {
+  subclass <- setdiff(methods::is(con), methods::extends("DBIConnection"))
+  c(paste0("src_", subclass), "src_dbi", "src_sql", "src")
+}
+
 methods::setOldClass(c("src_dbi", "src_sql", "src"))
 
 # nocov start

tests/testthat/test-src_dbi.R

@@ -4,3 +4,21 @@ test_that("tbl and src classes include connection class", {
   expect_true(inherits(mf, "tbl_SQLiteConnection"))
   expect_true(inherits(mf$src, "src_SQLiteConnection"))
 })
+
+test_that("generates S3 class based on S4 class name", {
+  con <- DBI::dbConnect(RSQLite::SQLite(), ":memory:")
+  expect_equal(
+    connection_s3_class(con), 
+    c("src_SQLiteConnection", "src_dbi", "src_sql", "src")
+ )
+
+  on.exit(removeClass("Foo2"))
+  on.exit(removeClass("Foo1"))
+
+  Foo1 <- setClass("Foo1", contains = "DBIConnection")
+  Foo2 <- setClass("Foo2", contains = "Foo1")
+  expect_equal(
+    connection_s3_class(Foo2()), 
+    c("src_Foo2", "src_Foo1", "src_dbi", "src_sql", "src")
+  )
+})