Changeset: 2740e1051d18 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2740e1051d18
Modified Files:
clients/R/MonetDB.R/DESCRIPTION
clients/R/MonetDB.R/NEWS
clients/R/MonetDB.R/R/monetdb.R
Branch: RIntegration-default
Log Message:
R Connector: small fixes
Unterschiede (62 Zeilen):
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
@@ -1,6 +1,6 @@
Package: MonetDB.R
-Version: 0.9.4
-Date: 2013-07-18
+Version: 0.9.5
+Date: 2014-07-24
Title: Connect MonetDB to R
Authors@R: c(person("Hannes Muehleisen", role = c("aut", "cre"),email =
"han...@cwi.nl"),
person("Thomas Lumley", role = "ctb"),
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
@@ -1,3 +1,7 @@
+0.9.5
+- Fixed package date (Thanks, Dimitar)
+- Added sys. schema name to internal queries, so SET SCHEMA xx would not break
things (Thanks again, Dimitar)
+
0.9.4
- dbWriteTable overhaul (thanks, Anthony)
- Fix for dbListTables for MonetDB versions after Jan2014
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
@@ -21,7 +21,7 @@ MonetR <- MonetDB <- MonetDBR <- MonetDB
setMethod("dbGetInfo", "MonetDBDriver", def=function(dbObj, ...)
list(name="MonetDBDriver",
- driver.version="0.9.4",
+ driver.version="0.9.5",
DBI.version="0.2-7",
client.version=NA,
max.connections=NA)
@@ -135,7 +135,7 @@ setClass("MonetDBConnection", representa
connenv="environment",
fetchSize="integer", Id="integer"))
setMethod("dbGetInfo", "MonetDBConnection", def=function(dbObj, ...) {
- envdata <- dbGetQuery(dbObj, "SELECT name, value from env()")
+ envdata <- dbGetQuery(dbObj, "SELECT name, value from sys.env()")
ll <- as.list(envdata$value)
names(ll) <- envdata$name
ll$name <- "MonetDBConnection"
@@ -148,7 +148,7 @@ setMethod("dbDisconnect", "MonetDBConnec
})
setMethod("dbListTables", "MonetDBConnection", def=function(conn, ...,
sys_tables=F, schema_names=F, quote=F) {
- q <- "select schemas.name as sn, tables.name as tn from tables join schemas
on tables.schema_id=schemas.id"
+ q <- "select schemas.name as sn, tables.name as tn from tables join
sys.schemas on tables.schema_id=schemas.id"
if (!sys_tables) q <- paste0(q, " where tables.system=false")
df <- dbGetQuery(conn, q)
if (quote) {
@@ -185,7 +185,7 @@ setMethod("dbRollback", "MonetDBConnecti
setMethod("dbListFields", "MonetDBConnection", def=function(conn, name, ...) {
if (!dbExistsTable(conn, name))
stop(paste0("Unknown table: ", name));
- df <- dbGetQuery(conn, paste0("select columns.name as name from columns join
tables on \
+ df <- dbGetQuery(conn, paste0("select columns.name as name from sys.columns
join sys.tables on \
columns.table_id=tables.id where tables.name='", name, "';"))
df$name
})
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
