Skip to content

Commit

Permalink
WORKAROUND: Some functions pass msg$msgs to dbSendMessage() some msg$msg
Browse files Browse the repository at this point in the history
  • Loading branch information
HenrikBengtsson committed Mar 24, 2016
1 parent 267767e commit f907850
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions R/database.R
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}

Expand Down

0 comments on commit f907850

Please sign in to comment.