use safe gsub() call

- Fix `dbQuoteString()` and `dbQuoteIdentifier()` to ignore invalid UTF-8 strings (r-dbi/DBItest#156).
r-dbi · Nov 8, 2017 · 716d167 · 716d167
1 parent f8c97f2
commit 716d167
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/R/quote.R b/R/quote.R
@@ -95,7 +95,7 @@ setMethod("dbQuoteIdentifier", c("DBIConnection", "character"),
     if (any(is.na(x))) {
       stop("Cannot pass NA to dbQuoteIdentifier()", call. = FALSE)
     }
-    x <- gsub('"', '""', x, fixed = TRUE)
+    x <- gsub('"', '""', enc2utf8(x), fixed = TRUE, useBytes = TRUE)
     if (length(x) == 0L) {
       SQL(character())
     } else {
@@ -152,7 +152,7 @@ setGeneric("dbQuoteString",
 #' @export
 setMethod("dbQuoteString", c("DBIConnection", "character"),
   function(conn, x, ...) {
-    x <- gsub("'", "''", x, fixed = TRUE)
+    x <- gsub("'", "''", enc2utf8(x), fixed = TRUE, useBytes = TRUE)
 
     if (length(x) == 0L) {
       SQL(character())