Display reason in error message

Since reason seems to contain useful data sometimes. Fixes #209
r-dbi · Mar 28, 2018 · 98dec6f · 98dec6f
1 parent d9713da
commit 98dec6f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,8 @@
 # bigrquery 0.4.1.9000
 
+* Request error messages will now contain the "reason", which can contain 
+  useful information for debugging (#209).
+
 # Version 0.4.1
 
 * Fix SQL translation omissions discovered by dbplyr 1.1.0

diff --git a/R/request.r b/R/request.r
@@ -156,13 +156,15 @@ process_request <- function(req) {
 }
 
 signal_reason <- function(reason, message) {
-  if (!is.null(reason)) {
+  if (is.null(reason)) {
+    stop(message, call. = FALSE)
+  } else {
     cl <- c(paste0("bigrquery_", reason), "error", "condition")
+    message <- paste0(message, " [", reason, "]")
+
     cond <- structure(list(message = message), class = cl)
-    signalCondition(cond)
+    stop(cond)
   }
-
-  stop(message, call. = FALSE)
 }
 
 # Multipart/related ------------------------------------------------------------