Added support for returning option for dbxUpsert for MariaDB 10.5+ - c…

…loses #37
ankane · May 16, 2024 · b8b4d7f · b8b4d7f
1 parent 51f6fda
commit b8b4d7f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+## 0.3.2 (unreleased)
+
+- Added support for `returning` option for `dbxUpsert` for MariaDB 10.5+
+
 ## 0.3.1 (2023-12-11)
 
 - Added support for `dbxUpsert` for SQL Server

diff --git a/R/helpers.R b/R/helpers.R
@@ -140,8 +140,10 @@ selectOrExecute <- function(conn, sql, records, returning) {
     execute(conn, sql)
     invisible()
   } else {
-    if (!isPostgres(conn)) {
-      stop("returning is only supported with Postgres")
+    # allow for any MySQL adapter for now
+    # TODO add detection for MariaDB
+    if (!isPostgres(conn) && !isMySQL(conn)) {
+      stop("returning is only supported with Postgres and MariaDB")
     }
 
     if (inherits(returning, "SQL")) {

diff --git a/tests/testthat/helper-is.R b/tests/testthat/helper-is.R
@@ -26,6 +26,12 @@ isRMariaDB <- function(conn) {
   inherits(conn, "MariaDBConnection")
 }
 
+isMariaDB <- function(conn) {
+  # RMariaDB uses MySQLConnection for MySQL for 1.3+
+  # TODO add detection for other adapters
+  inherits(conn, "MariaDBConnection")
+}
+
 isSQLite <- function(conn) {
   inherits(conn, "SQLiteConnection")
 }

diff --git a/tests/testthat/helper-run-upsert-tests.R b/tests/testthat/helper-run-upsert-tests.R
@@ -58,7 +58,7 @@ runUpsertTests <- function(db, redshift=FALSE) {
   })
 
   test_that("upsert returning works", {
-    skip_if(!isPostgres(db) || redshift)
+    skip_if(!(isPostgres(db) || isMariaDB(db)) || redshift)
 
     events <- data.frame(id=c(1, 2), city=c("San Francisco", "Boston"), stringsAsFactors=FALSE)
     res <- dbxUpsert(db, "events", events, where_cols=c("id"), returning=c("id", "city"))