Changeset: b6a97af10103 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b6a97af10103 Modified Files: clients/R/MonetDB.R/DESCRIPTION clients/R/MonetDB.R/R/monetdb.R clients/R/db.tests/sqlsurvey.test.R Branch: default Log Message:
R Connector: dplyr compatibility changes diffs (64 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 @@ -10,4 +10,9 @@ Description: Allows to pull data from Mo License: MPL (== 1.1) URL: http://monetr.r-forge.r-project.org Maintainer: Hannes Muehleisen <[email protected]> -SystemRequirements: MonetDB installation, available at http://www.monetdb.org +SystemRequirements: MonetDB installation, available at + http://www.monetdb.org +Packaged: 2014-03-01 14:13:44 UTC; hannes +Author: Hannes Muehleisen [aut, cre], + Thomas Lumley [ctb], + Anthony Damico [ctb] 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 @@ -25,7 +25,7 @@ MonetR <- MonetDB <- MonetDBR <- MonetDB setMethod("dbGetInfo", "MonetDBDriver", def=function(dbObj, ...) list(name="MonetDBDriver", - driver.version="0.9", + driver.version="0.9.1", DBI.version="0.2-5", client.version=NA, max.connections=NA) @@ -101,14 +101,14 @@ setMethod("dbConnect", "MonetDBDriver", connenv$lock <- 0 connenv$deferred <- list() connenv$exception <- list() - - return(new("MonetDBConnection",socket=socket,connenv=connenv)) + + return(new("MonetDBConnection",socket=socket,connenv=connenv,Id=-1L)) }, valueClass="MonetDBConnection") ### MonetDBConnection, #monetdb_mapi_conn -setClass("MonetDBConnection", representation("DBIConnection",socket="externalptr",connenv="environment",fetchSize="integer")) +setClass("MonetDBConnection", representation("DBIConnection",socket="externalptr",connenv="environment",fetchSize="integer",Id="integer")) setMethod("dbGetInfo", "MonetDBConnection", def=function(dbObj, ...) { envdata <- dbGetQuery(dbObj,"SELECT name, value from env()") diff --git a/clients/R/db.tests/sqlsurvey.test.R b/clients/R/db.tests/sqlsurvey.test.R --- a/clients/R/db.tests/sqlsurvey.test.R +++ b/clients/R/db.tests/sqlsurvey.test.R @@ -1,6 +1,8 @@ library(MonetDB.R) library(sqlsurvey) +# install.packages("sqlsurvey", repos=c("http://cran.r-project.org","http://R-Forge.R-project.org";), dep=TRUE) + db <- dbConnect( MonetDB.R() , "monetdb://localhost/monetdbrtest") data( api ) @@ -45,7 +47,5 @@ svymean( ~dname , dclus1 , byvar = ~comp dbGetQuery( db , 'select * from apiclus1 limit 2' ) dbRemoveTable(db,"apiclus1") -# delete these pesky tables -dbSendUpdate(db,paste0("DROP TABLE \"",grep("_m(f|m)_",dbListTables(db),value=T),"\";",collapse="\n")) print("SUCCESS") _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
