Changeset: 78ff3d54f4f9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=78ff3d54f4f9
Modified Files:
        clients/R/MonetDB.R/DESCRIPTION
        clients/R/MonetDB.R/R/dbapply.R
Branch: default
Log Message:

R Connector: More package exclusions


diffs (24 lines):

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
@@ -6,7 +6,7 @@ Authors@R: c(person("Hannes Muehleisen",
        person("Anthony Damico", role = "ctb"))
 Author: Hannes Muehleisen [aut, cre], Thomas Lumley [ctb], Anthony Damico [ctb]
 Maintainer: Hannes Muehleisen <han...@cwi.nl>
-Depends: DBI (>= 0.3.1), digest (>= 0.6.4), methods, R (>= 3.1.1)
+Depends: DBI (>= 0.3.1), digest (>= 0.6.4), methods, R (>= 3.1.1), codetools
 Enhances: dplyr (>= 0.3.0)
 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/R/dbapply.R b/clients/R/MonetDB.R/R/dbapply.R
--- a/clients/R/MonetDB.R/R/dbapply.R
+++ b/clients/R/MonetDB.R/R/dbapply.R
@@ -29,7 +29,7 @@ setMethod("dbApply", signature(conn="Mon
 
   # now generate the UDF
   # find packages loaded here and load them on the server as well
-  toloadpkgs <- 
setdiff(unique(sapply(strsplit(grep("^package:",search(),value=T),":"),function(x)
 
x[[2]])),c("base","stats","methods","utils","codetools","graphics","grDevices","datasets"))
+  toloadpkgs <- 
setdiff(unique(sapply(strsplit(grep("^package:",search(),value=T),":"),function(x)
 
x[[2]])),c("base","stats","methods","utils","codetools","graphics","grDevices","datasets","MonetDB.R","DBI","digest"))
   dbrcode <- ''
   if (length(toloadpkgs) > 0) {
     if (getOption("monetdb.debug.query",FALSE)) 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to