MonetDB: embedded - R package: moving towards CRAN submission

[Hannes Muehleisen]

Changeset: 248ae90c7eb4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=248ae90c7eb4
Modified Files:
        clients/R/MonetDB.R/R/dbi.R
        clients/R/MonetDB.R/man/src_monetdb.Rd
        tools/embedded/rpackage/tests/testthat.R
        tools/embedded/rpackage/tests/testthat/test_lowlevel.R
Branch: embedded
Log Message:

R package: moving towards CRAN submission


diffs (62 lines):

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
@@ -91,7 +91,7 @@ setMethod("dbConnect", "MonetDBDriver", 
     if (!require("MonetDBLite", character.only=T)) {
       stop("MonetDBLite package required for embedded mode")
     }
-    monetdb_embedded_startup(embedded, !getOption("monetdb.debug.embedded", 
FALSE))
+    MonetDBLite::monetdb_embedded_startup(embedded, 
!getOption("monetdb.debug.embedded", FALSE))
     connenv <- new.env(parent=emptyenv())
     connenv$open <- TRUE
     return(new("MonetDBEmbeddedConnection", connenv=connenv))
@@ -312,7 +312,7 @@ setMethod("dbSendQuery", signature(conn=
   env <- NULL
   if (getOption("monetdb.debug.query", F)) message("QQ: '", statement, "'")
 
-  resp <- monetdb_embedded_query(statement, notreally)
+  resp <- MonetDBLite::monetdb_embedded_query(statement, notreally)
 
   env <- new.env(parent=emptyenv())
   if (resp$type == Q_TABLE) {
@@ -423,7 +423,7 @@ setMethod("dbWriteTable", "MonetDBConnec
       for (c in datecols) {
         value[[c]] <- as.character(value[[c]])
       }
-      insres <- monetdb_embedded_append(qname, value)
+      insres <- MonetDBLite::monetdb_embedded_append(qname, value)
       if (!is.logical(insres)) {
         stop("Failed to insert data: ", insres)
       }
diff --git a/clients/R/MonetDB.R/man/src_monetdb.Rd 
b/clients/R/MonetDB.R/man/src_monetdb.Rd
--- a/clients/R/MonetDB.R/man/src_monetdb.Rd
+++ b/clients/R/MonetDB.R/man/src_monetdb.Rd
@@ -10,6 +10,8 @@
 \alias{db_insert_into.MonetDBConnection}
 \alias{db_query_fields.MonetDBConnection}
 \alias{db_query_rows.MonetDBConnection}
+\alias{db_query_fields.MonetDBEmbeddedConnection}
+\alias{db_query_rows.MonetDBEmbeddedConnection}
 \alias{db_save_query.MonetDBConnection}
 \alias{sql_subquery.MonetDBConnection}
 
diff --git a/tools/embedded/rpackage/tests/testthat.R 
b/tools/embedded/rpackage/tests/testthat.R
--- a/tools/embedded/rpackage/tests/testthat.R
+++ b/tools/embedded/rpackage/tests/testthat.R
@@ -1,4 +1,4 @@
 library(testthat)
-library(MonetDB)
+library(MonetDBLite)
 
-test_check("MonetDB")
+test_check("MonetDBLite")
diff --git a/tools/embedded/rpackage/tests/testthat/test_lowlevel.R 
b/tools/embedded/rpackage/tests/testthat/test_lowlevel.R
--- a/tools/embedded/rpackage/tests/testthat/test_lowlevel.R
+++ b/tools/embedded/rpackage/tests/testthat/test_lowlevel.R
@@ -1,5 +1,5 @@
 library(testthat)
-library(MonetDB)
+library(MonetDBLite)
 
 test_that("db starts up", {
        expect_equal(monetdb_embedded_startup(), TRUE)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list