Changeset: d4407c6f864d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4407c6f864d
Modified Files:
clients/R/MonetDB.R/R/dbi.R
clients/R/Tests/dbi.R
Branch: default
Log Message:
R Connector: Fix for dbConnect() from sqlsurvey
diffs (31 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(dbname, 1, 10) == "monetdb://") {
- url <- dbname
+ if (substring(url, 1, 10) == "monetdb://") {
+ dbname <- url
}
timeout <- as.integer(timeout)
diff --git a/clients/R/Tests/dbi.R b/clients/R/Tests/dbi.R
--- a/clients/R/Tests/dbi.R
+++ b/clients/R/Tests/dbi.R
@@ -174,10 +174,12 @@ stopifnot(identical(1L, as.integer(dbGet
# reserved words in data frame column names
stopifnot(dbIsValid(conn))
dbBegin(conn)
-dbWriteTable(conn, "evilt", data.frame(year=42, month=12, day=24),
transaction=F)
+dbWriteTable(conn, "evilt", data.frame(year=42, month=12, day=24,
some.dot=12), transaction=F)
stopifnot(dbExistsTable(conn, "evilt"))
dbRollback(conn)
+stopifnot(dbGetQuery(conn, "SELECT * FROM tables WHERE 1=0") != NULL)
+
stopifnot(dbIsValid(conn))
#thrice to catch null pointer errors
stopifnot(identical(dbDisconnect(con),TRUE))
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
