Changeset: a96126293533 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a96126293533
Modified Files:
clients/R/MonetDB.R/NAMESPACE
clients/R/MonetDB.R/R/monetdb.R
Branch: Oct2014
Log Message:
R Connector: fixed c-based socket thingy
Unterschiede (36 Zeilen):
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)
+exportMethods(dbSendUpdate,dbSendUpdateAsync,dbTransaction,dbIsValid)
export(monetdbGetTransferredBytes)
export(monetdbRtype)
export(monetdb_queryinfo)
diff --git a/clients/R/MonetDB.R/R/monetdb.R b/clients/R/MonetDB.R/R/monetdb.R
--- a/clients/R/MonetDB.R/R/monetdb.R
+++ b/clients/R/MonetDB.R/R/monetdb.R
@@ -18,6 +18,11 @@ 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(TRUE) # driver object cannot be invalid
})
@@ -139,7 +144,7 @@ valueClass="MonetDBConnection")
### MonetDBConnection
-setClass("MonetDBConnection", representation("DBIConnection",
socket="connection",
+setClass("MonetDBConnection", representation("DBIConnection", socket="ANY",
connenv="environment",
fetchSize="integer", Id="integer"))
setMethod("dbGetInfo", "MonetDBConnection", def=function(dbObj, ...) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
