Changeset: 0790ba0c95a2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0790ba0c95a2
Modified Files:
clients/R/MonetDB.R/NEWS
clients/R/MonetDB.R/R/dbi.R
tools/embedded/build-rpkg.sh
tools/embedded/rpackage/DESCRIPTION
Branch: embedded
Log Message:
Renamed R package to MonetDBLite
diffs (58 lines):
diff --git a/clients/R/MonetDB.R/NEWS b/clients/R/MonetDB.R/NEWS
--- a/clients/R/MonetDB.R/NEWS
+++ b/clients/R/MonetDB.R/NEWS
@@ -12,6 +12,7 @@ 1.0.0
- Added lower.case.names argument to monet.read.csv() in case users want to
avoid quoting (a bit)
- Fix for dbConnect() that should be more robust to invalid connections
- Cleaned up quoting behavior in dbListTables(), dbRemoveTable() etc.
+- Initial support for running MonetDB in embedded mode (MonetDBLite)
0.9.7
- Fixed crash on Windows (Sorry, everyone)
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
@@ -88,8 +88,8 @@ setMethod("dbConnect", "MonetDBDriver",
}
if (embedded != FALSE) {
- if (!require("MonetDB", character.only=T)) {
- stop("MonetDB package required for embedded mode")
+ if (!require("MonetDBLite", character.only=T)) {
+ stop("MonetDBLite package required for embedded mode")
}
monetdb_embedded_startup(embedded, !getOption("monetdb.debug.embedded",
FALSE))
connenv <- new.env(parent=emptyenv())
diff --git a/tools/embedded/build-rpkg.sh b/tools/embedded/build-rpkg.sh
--- a/tools/embedded/build-rpkg.sh
+++ b/tools/embedded/build-rpkg.sh
@@ -2,7 +2,7 @@
#set -x
STAGEDIR=/tmp/monetdb-embedded-stage
-RPKG=MonetDB_1.0.0.tar.gz
+RPKG=MonetDBLite_1.0.0.tar.gz
rm -rf $STAGEDIR
@@ -43,7 +43,7 @@ R CMD build rpackage
scp $RPKG cwi:WWW/R
echo
-echo 'install.packages("MonetDB", repos="http://homepages.cwi.nl/~hannes/R/";,
type="source")'
+echo 'install.packages("MonetDBLite",
repos="http://homepages.cwi.nl/~hannes/R/";, type="source")'
echo
# OSX 10.10 check (check vanilla!)
diff --git a/tools/embedded/rpackage/DESCRIPTION
b/tools/embedded/rpackage/DESCRIPTION
--- a/tools/embedded/rpackage/DESCRIPTION
+++ b/tools/embedded/rpackage/DESCRIPTION
@@ -1,6 +1,6 @@
-Package: MonetDB
+Package: MonetDBLite
Version: 1.0.0
-Title: Connect MonetDB to R
+Title: In-Process version of MonetDB for R
Authors@R: c(person("Hannes Muehleisen", role = c("aut", "cre"),email =
"[email protected]"))
Author: Hannes Muehleisen [aut, cre]
Maintainer: Hannes Muehleisen <[email protected]>
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
