Changeset: 91d5dc932c7d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=91d5dc932c7d
Modified Files:
clients/R/MonetDB.R/R/mapi.R
clients/R/Tests/dbi.R
clients/R/Tests/dbi.stable.out
Branch: Oct2014
Log Message:
R Connector: ASCII fix round 2 and approved test output
diffs (43 lines):
diff --git a/clients/R/MonetDB.R/R/mapi.R b/clients/R/MonetDB.R/R/mapi.R
--- a/clients/R/MonetDB.R/R/mapi.R
+++ b/clients/R/MonetDB.R/R/mapi.R
@@ -167,8 +167,8 @@ REPLY_SIZE <- 100 # Apparently, -1 me
msgr <- charToRaw(msg)
msglen <- length(msgr)
while (!final) {
- reqr <- msgr[pos+1 : min(MAX_PACKET_SIZE, msglen) + pos]
- bytes <- length(reqr)
+ bytes <- min(MAX_PACKET_SIZE, msglen - pos)
+ reqr <- msgr[(pos + 1) : (pos + bytes)]
pos <- pos + bytes
final <- max(msglen - pos, 0) == 0
header <- as.integer(bitwOr(bitwShiftL(bytes, 1), as.numeric(final)))
diff --git a/clients/R/Tests/dbi.R b/clients/R/Tests/dbi.R
--- a/clients/R/Tests/dbi.R
+++ b/clients/R/Tests/dbi.R
@@ -159,9 +159,12 @@ dbRemoveTable(conn,tname)
# funny characters in strings
stopifnot(dbIsValid(conn))
dbBegin(conn)
-sq <- dbSendQuery(conn,"create table monetdbtest (a string)")
+sq <- dbSendQuery(conn,"CREATE TABLE monetdbtest (a string)")
sq <- dbSendQuery(conn,"INSERT INTO monetdbtest VALUES ('Роман Mühleisen')")
stopifnot(identical("Роман Mühleisen", dbGetQuery(conn,"SELECT a FROM
monetdbtest")$a[[1]]))
+sq <- dbSendQuery(conn,"DELETE FROM monetdbtest")
+dbSendUpdate(conn, "INSERT INTO monetdbtest (a) VALUES (?)", "Роман Mühleisen")
+stopifnot(identical("Роман Mühleisen", dbGetQuery(conn,"SELECT a FROM
monetdbtest")$a[[1]]))
dbRollback(conn)
stopifnot(dbIsValid(conn))
diff --git a/clients/R/Tests/dbi.stable.out b/clients/R/Tests/dbi.stable.out
--- a/clients/R/Tests/dbi.stable.out
+++ b/clients/R/Tests/dbi.stable.out
@@ -69,6 +69,8 @@ 1 150
[1] TRUE
[1] TRUE
[1] TRUE
+[1] TRUE
+[1] TRUE
[1] "SUCCESS"
# 14:24:04 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
