MonetDB: Jul2015 - MC node and R clients

[Hannes Muehleisen]

Changeset: d4453af42bea for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4453af42bea
Modified Files:
        clients/R/Tests/dbi.R
        clients/nodejs/monetdb/mapiclient.js
        clients/nodejs/monetdb/package.json
Branch: Jul2015
Log Message:

MC node and R clients


diffs (50 lines):

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
@@ -90,10 +90,10 @@ dbRemoveTable(con,tname)
 stopifnot(identical(dbExistsTable(con,tname),FALSE))
 
 # test csv import
-file <- tempfile()
-write.table(iris,file,sep=",")
-monetdb.read.csv(con,file,tname)
-unlink(file)
+tf <- tempfile()
+write.table(iris,tf,sep=",",row.names=F)
+monetdb.read.csv(con,tf,tname)
+unlink(tf)
 stopifnot(identical(dbExistsTable(con,tname),TRUE))
 iris3 <- dbReadTable(con,tname)
 stopifnot(identical(dim(iris),dim(iris3)))
diff --git a/clients/nodejs/monetdb/mapiclient.js 
b/clients/nodejs/monetdb/mapiclient.js
--- a/clients/nodejs/monetdb/mapiclient.js
+++ b/clients/nodejs/monetdb/mapiclient.js
@@ -34,7 +34,7 @@ function MonetDBConnection(options, conn
        });
        /* some setup */
        this.request('Xreply_size -1', undefined, true);
-       this.request('Xauto_commit 1', undefined, true);
+       if (!options.autocommit) this.request('Xauto_commit 0', undefined, 
true);
        /* get server environment into connector */
        this.request('SELECT * FROM env()', function(err, resp) {
                if (err) {
@@ -489,7 +489,7 @@ function __get_connect_args(options) {
        __check_arg(options, 'language', 'string'  , 'sql');
        __check_arg(options, 'debug'   , 'boolean' , false);
        __check_arg(options, 'q'       , 'function', undefined);
-
+       __check_arg(options, 'autocommit', 'boolean', true);
   return options;
 }
 
diff --git a/clients/nodejs/monetdb/package.json 
b/clients/nodejs/monetdb/package.json
--- a/clients/nodejs/monetdb/package.json
+++ b/clients/nodejs/monetdb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monetdb",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Connect MonetDB and node.js",
   "main": "mapiclient.js",
   "author": "Hannes Mühleisen <han...@cwi.nl>",
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list