chore: Indicate MySQL server, bump to dev version of RMariaDB, work a…

…round tidyverse/dbplyr#1190

DESCRIPTION

@@ -69,7 +69,7 @@ Suggests:
     colourpicker,
     covr,
     crayon,
-    dbplyr (>= 2.2.0),
+    dbplyr (>= 2.3.4),
     DiagrammeR,
     DiagrammeRsvg,
     digest,
@@ -91,7 +91,7 @@ Suggests:
     pool,
     progress,
     reactable,
-    RMariaDB (>= 1.2.2),
+    RMariaDB (>= 1.2.2.9008),
     rmarkdown,
     RPostgres,
     RSQLite (>= 2.2.8),
@@ -127,3 +127,5 @@ Roxygen: list(
       roclets = c("collate", "namespace", "rd", "roxyglobals::global_roclet")
     )
 RoxygenNote: 7.2.3
+Remotes: 
+    r-dbi/RMariaDB

R/db-helpers.R

@@ -56,7 +56,17 @@ is_postgres <- function(dest) {
 }
 
 is_mariadb <- function(dest) {
-  inherits_any(dest, c("MariaDBConnection", "src_MariaDBConnection", "src_DoltConnection", "src_DoltLocalConnection"))
+  inherits_any(
+    dest,
+    c(
+      "MariaDBConnection",
+      "src_MariaDBConnection",
+      "MySQLConnection",
+      "src_MySQLConnection",
+      "src_DoltConnection",
+      "src_DoltLocalConnection"
+    )
+  )
 }
 
 schema_supported_dbs <- function() {

R/mariadb.R

@@ -0,0 +1,10 @@
+# No longer needed for dbplyr >= 2.4.0
+# https://github.com/tidyverse/dbplyr/pull/1190
+rlang::on_load({
+  if (rlang::is_installed("dbplyr") && getNamespaceInfo("dbplyr", "spec")["version"] <= "2.3.4") {
+    dbplyr <- asNamespace("dbplyr")
+    unlockBinding("sql_values_subquery.MariaDBConnection", dbplyr)
+    try(dbplyr$sql_values_subquery.MariaDBConnection <- dbplyr$sql_values_subquery.DBIConnection, silent = TRUE)
+    lockBinding("sql_values_subquery.MariaDBConnection", dbplyr)
+  }
+})