From f907850fa765aff278ea2847e90b355ab5c5acbc Mon Sep 17 00:00:00 2001
From: hb <hb@aroma-project.org>
Date: Thu, 24 Mar 2016 13:50:55 -0700
Subject: [PATCH] WORKAROUND: Some functions pass msg$msgs to dbSendMessage()
 some msg$msg

---
 R/database.R | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/R/database.R b/R/database.R
index acc55c6..9e62a79 100644
--- a/R/database.R
+++ b/R/database.R
@@ -359,12 +359,16 @@ dbMatchJobNames = function(reg, ids, jobnames) {
 ### Messages
 ############################################
 dbSendMessage = function(reg, msg, staged = useStagedQueries(), fs.timeout = NA_real_) {
+  ## AD HOC/FIXME: Avoid partial matching; some functions pass 'msg' with
+  ## field 'msgs' and some with field 'msg' (e.g. dbMakeMessageError()).
+  msgT <- if ("msgs" %in% names(msg)) msg$msgs else msg$msg
+
   if (staged) {
     fn = getPendingFile(reg, msg$type, msg$ids[1L])
-    writeSQLFile(msg$msgs, fn)
+    writeSQLFile(msgT, fn)
     waitForFiles(fn, timeout = fs.timeout)
   } else {
-    dbDoQuery(reg, msg$msgs, flags = "rw")
+    dbDoQuery(reg, msgT, flags = "rw")
   }
 }