Changeset: 6daa0311b501 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6daa0311b501
Modified Files:
clients/R/MonetDB.R/R/dbi.R
clients/R/Tests/survey.R
clients/R/Tests/survey.stable.err
Branch: Oct2014
Log Message:
merged
diffs (55 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
@@ -46,8 +46,8 @@ setMethod("dbConnect", "MonetDBDriver",
password="monetdb",
host="localhost", port=50000L, timeout=86400L, wait=FALSE, language="sql",
..., url="") {
- if (substring(url, 1, 10) == "monetdb://") {
- dbname <- url
+ if (substring(dbname, 1, 10) == "monetdb://") {
+ url <- dbname
}
timeout <- as.integer(timeout)
diff --git a/clients/R/Tests/survey.R b/clients/R/Tests/survey.R
--- a/clients/R/Tests/survey.R
+++ b/clients/R/Tests/survey.R
@@ -2,8 +2,10 @@ ll <- NULL
if (Sys.getenv("TSTTRGDIR") != "") {
ll <- paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")
}
-library(MonetDB.R,quietly=T,lib.loc=ll)
-library(sqlsurvey,quietly=T)
+suppressMessages({
+ library(MonetDB.R,quietly=T,lib.loc=ll)
+ library(sqlsurvey,quietly=T)
+})
args <- commandArgs(trailingOnly = TRUE)
dbport <- 50000
diff --git a/clients/R/Tests/survey.stable.err
b/clients/R/Tests/survey.stable.err
--- a/clients/R/Tests/survey.stable.err
+++ b/clients/R/Tests/survey.stable.err
@@ -30,18 +30,8 @@ stderr of test 'survey` in directory 'cl
# 14:26:23 > "R" "--vanilla" "--slave" "--args" "38676"
# 14:26:23 >
-KernSmooth 2.23 loaded
-Copyright M. P. Wand 1997-2009
-Loading required package: grid
-Attaching package: 'survey'
+# 13:05:49 >
+# 13:05:49 > "Done."
+# 13:05:49 >
-The following object is masked from 'package:graphics':
-
- dotchart
-
-
-# 14:26:26 >
-# 14:26:26 > "Done."
-# 14:26:26 >
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
