Changeset: 2e271e34927a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2e271e34927a
Modified Files:
monetdb5/extras/rapi/converters.c
tools/embedded/embeddedr.c
tools/embedded/rpackage/R/monetdb.R
Branch: embedded
Log Message:
more DBItest compliance
diffs (40 lines):
diff --git a/monetdb5/extras/rapi/converters.c
b/monetdb5/extras/rapi/converters.c
--- a/monetdb5/extras/rapi/converters.c
+++ b/monetdb5/extras/rapi/converters.c
@@ -2,7 +2,7 @@
do {
\
tpe v; size_t j;
\
ctype *valptr = NULL; \
- tpe* p = (tpe*) Tloc(bat,BUNfirst(bat)); \
+ tpe* p = (tpe*) Tloc(bat, BUNfirst(bat)); \
retsxp = PROTECT(newfun(BATcount(bat))); \
valptr = ptrfun(retsxp); \
if (bat->T->nonil && !bat->T->nil) { \
diff --git a/tools/embedded/embeddedr.c b/tools/embedded/embeddedr.c
--- a/tools/embedded/embeddedr.c
+++ b/tools/embedded/embeddedr.c
@@ -52,10 +52,9 @@ SEXP monetdb_query_R(SEXP connsexp, SEXP
}
SET_VECTOR_ELT(retlist, i, varvalue);
}
+ monetdb_cleanup_result(R_ExternalPtrAddr(connsexp), output);
SET_NAMES(retlist, names);
UNPROTECT(output->nr_cols + 2);
-
- monetdb_cleanup_result(R_ExternalPtrAddr(connsexp), output);
return retlist;
}
return ScalarLogical(1);
diff --git a/tools/embedded/rpackage/R/monetdb.R
b/tools/embedded/rpackage/R/monetdb.R
--- a/tools/embedded/rpackage/R/monetdb.R
+++ b/tools/embedded/rpackage/R/monetdb.R
@@ -68,7 +68,9 @@ monetdb_embedded_query <- function(conn,
if (is.list(res)) {
resp$type <- 1 # Q_TABLE
attr(res, "row.names") <- c(NA_integer_, length(res[[1]]))
+ attr(res, "__rows") <- NULL
class(res) <- "data.frame"
+ names(res) <- gsub("\\", "", names(res), fixed=T)
resp$tuples <- res
}
resp
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
