allow columns in dbQuoteIdentifier(), r-dbi#254

dpprdan · Dec 29, 2021 · dd70b7c · dd70b7c
1 parent 0e17617
commit dd70b7c
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/R/dbQuoteIdentifier_MariaDBConnection_Id.R b/R/dbQuoteIdentifier_MariaDBConnection_Id.R
@@ -1,17 +1,12 @@
 #' @name mariadb-quoting
 #' @usage NULL
 dbQuoteIdentifier_MariaDBConnection_Id <- function(conn, x, ...) {
-  stopifnot(all(names(x@name) %in% c("schema", "table")))
+  components <- c("schema", "table", "column")
+  stopifnot(all(names(x@name) %in% components))
   stopifnot(!anyDuplicated(names(x@name)))
 
-  ret <- ""
-  if ("schema" %in% names(x@name)) {
-    ret <- paste0(ret, dbQuoteIdentifier(conn, x@name[["schema"]]), ".")
-  }
-  if ("table" %in% names(x@name)) {
-    ret <- paste0(ret, dbQuoteIdentifier(conn, x@name[["table"]]))
-  }
-  SQL(ret)
+  ret <- stats::na.omit(x@name[match(components, names(x@name))])
+  SQL(paste0(dbQuoteIdentifier(conn, ret), collapse = "."))
 }
 
 #' @rdname mariadb-quoting