Changeset: b49db4723ed2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b49db4723ed2
Modified Files:
clients/R/MonetDB.R/DESCRIPTION
clients/R/MonetDB.R/NAMESPACE
clients/R/MonetDB.R/R/dbi.R
clients/R/MonetDB.R/R/mapi.R
Branch: Oct2014
Log Message:
R Connector various updates
Unterschiede (74 Zeilen):
diff --git a/clients/R/MonetDB.R/DESCRIPTION b/clients/R/MonetDB.R/DESCRIPTION
--- a/clients/R/MonetDB.R/DESCRIPTION
+++ b/clients/R/MonetDB.R/DESCRIPTION
@@ -4,7 +4,7 @@ Title: Connect MonetDB to R
Authors@R: c(person("Hannes Muehleisen", role = c("aut", "cre"),email =
"han...@cwi.nl"),
person("Thomas Lumley", role = "ctb"),
person("Anthony Damico", role = "ctb"))
-Depends: DBI (>= 0.3), digest (>= 0.6.4), bitops (>= 1.0), methods
+Depends: DBI (>= 0.3.1), digest (>= 0.6.4), bitops (>= 1.0), methods
Suggests: dplyr(>= 0.3)
Description: Allows to pull data from MonetDB into R. Includes a DBI
implementation and a dplyr backend.
License: MPL (== 1.1)
diff --git a/clients/R/MonetDB.R/NAMESPACE b/clients/R/MonetDB.R/NAMESPACE
--- a/clients/R/MonetDB.R/NAMESPACE
+++ b/clients/R/MonetDB.R/NAMESPACE
@@ -4,7 +4,7 @@ import(DBI,digest,methods,bitops)
export(MonetDB,MonetR,MonetDBR,MonetDB.R)
export(monet.read.csv,monetdb.read.csv)
# this one is not in the DBI
-exportMethods(dbSendUpdate,dbSendUpdateAsync,dbTransaction,dbIsValid)
+exportMethods(dbSendUpdate,dbSendUpdateAsync,dbTransaction)
# shorthands
export(mc,mq)
diff --git a/clients/R/MonetDB.R/R/dbi.R b/clients/R/MonetDB.R/R/dbi.R
--- a/clients/R/MonetDB.R/R/dbi.R
+++ b/clients/R/MonetDB.R/R/dbi.R
@@ -18,11 +18,6 @@ MonetR <- MonetDB <- MonetDBR <- MonetDB
new("MonetDBDriver")
}
-# dbIsValid is missing from the DBI 0.3, so redefine
-setGeneric("dbIsValid",
- def = function(dbObj, ...) standardGeneric("dbIsValid"),
- valueClass = "logical")
-
setMethod("dbIsValid", "MonetDBDriver", def=function(dbObj, ...) {
return(invisible(TRUE)) # driver object cannot be invalid
})
@@ -225,7 +220,7 @@ setMethod("dbGetException", "MonetDBConn
setMethod("dbReadTable", "MonetDBConnection", def=function(conn, name, ...) {
if (!dbExistsTable(conn, name))
stop(paste0("Unknown table: ", name));
- dbGetQuery(conn, paste0("SELECT * FROM ", name))
+ dbGetQuery(conn,paste0("SELECT * FROM ", name))
})
# This one does all the work in this class
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
@@ -315,11 +315,11 @@ REPLY_SIZE <- 100 # Apparently, -1 me
salt <- credentials[[1]][1]
if (!(endhashfunc %in% HASH_ALGOS)) {
- stop(paste("Server-requested end hash function", endhashfunc, "is not
available"))
+ stop("Server-requested end hash function ", endhashfunc, " is not
available")
}
if (!(pwhashfunc %in% HASH_ALGOS)) {
- stop(paste("Server-requested password hash function", pwhashfunc, "is not
available"))
+ stop("Server-requested password hash function ", pwhashfunc, " is not
available")
}
# We first hash the password with the server-requested hash function
@@ -351,7 +351,7 @@ REPLY_SIZE <- 100 # Apparently, -1 me
.mapiAuthenticate(con, dbname, user, password, endhashfunc)
}
if (protocol == "monetdb") {
- stop(paste0("Forwarding to another server (", link, ") not
supported."))
+ stop("Forwarding to another server (", link, ") not supported.")
}
}
if (respKey == MSG_MESSAGE) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
