Changeset: fb381d68bacc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fb381d68bacc
Modified Files:
clients/R/MonetDB.R/NAMESPACE
clients/R/MonetDB.R/R/dbi.R
tools/embedded/rpackage/R/monetdb.R
Branch: embedded
Log Message:
More RSQLite compat
diffs (48 lines):
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
@@ -5,7 +5,7 @@ export(MonetDB,MonetR,MonetDBR,MonetDB.R
export(MonetDBLite,monetdblite,RMonetDBLite,rmonetdblite)
export(monet.read.csv,monetdb.read.csv)
# this one is not in the DBI
-exportMethods(dbSendUpdate,dbSendUpdateAsync,dbTransaction,mdbapply,isIdCurrent)
+exportMethods(dbSendUpdate,dbSendUpdateAsync,dbTransaction,mdbapply,isIdCurrent,initExtension)
# shorthands
export(mc,mq)
useDynLib(MonetDB.R)
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
@@ -823,6 +823,12 @@ setMethod("isIdCurrent", signature(dbObj
dbIsValid(dbObj)
})
+if (is.null(getGeneric("initExtension"))) setGeneric("initExtension",
function(dbObj, ...) standardGeneric("initExtension"))
+setMethod("initExtension", signature(dbObj="MonetDBConnection"),
def=function(dbObj, ...) {
+ .Deprecated(msg="initExtension() is not required for MonetDBLite")
+})
+
+
setMethod("dbIsValid", signature(dbObj="MonetDBResult"), def=function(dbObj,
...) {
if (dbObj@env$info$type == Q_TABLE) {
return(dbObj@env$open)
diff --git a/tools/embedded/rpackage/R/monetdb.R
b/tools/embedded/rpackage/R/monetdb.R
--- a/tools/embedded/rpackage/R/monetdb.R
+++ b/tools/embedded/rpackage/R/monetdb.R
@@ -13,7 +13,7 @@ monetdb_embedded_env$install_dir <- ""
classname <- "monetdb_embedded_connection"
monetdb_embedded_startup <- function(dir=tempdir(), quiet=TRUE) {
- dir <- normalizePath(as.character(dir), mustWork=FALSE)
+ dir <- as.character(dir)
quiet <- as.logical(quiet)
if (length(dir) != 1) {
stop("Need a single directory name as parameter.")
@@ -24,6 +24,7 @@ monetdb_embedded_startup <- function(dir
if (file.access(dir, mode=2) < 0) {
stop("Cannot write to ", dir)
}
+ dir <- normalizePath(dir)
if (!monetdb_embedded_env$is_started) {
res <- .Call("monetdb_startup_R",
monetdb_embedded_env$install_dir, dir, quiet, PACKAGE="libmonetdb5")
} else {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
