rethinkdbdash
Advanced tools
Comparing version 2.1.11 to 2.1.12
{ | ||
"name": "rethinkdbdash", | ||
"version": "2.1.11", | ||
"version": "2.1.12", | ||
"description": "A Node.js driver for RethinkDB with promises and a connection pool", | ||
@@ -5,0 +5,0 @@ "main": "lib/index.js", |
@@ -196,3 +196,3 @@ rethinkdbdash | ||
- `silent`: <boolean> - console.error errors, default `false` | ||
- `servers`: an of objects `{host: <string>, port: <number>}` representing instances of | ||
- `servers`: an array of objects `{host: <string>, port: <number>}` representing RethinkDB nodes to connect to | ||
- `optionalRun`: <boolean> - if `false`, yielding a query will not run it, default `true` | ||
@@ -199,0 +199,0 @@ RethinkDB to connect to. |
@@ -162,2 +162,4 @@ var config = require(__dirname+'/config.js'); | ||
result = yield r.expr({a: 1}).merge({nested: r.row}, {b: 2}).run(); | ||
assert.deepEqual(result, {a: 1, nested: {a: 1}, b: 2}) | ||
@@ -219,3 +221,3 @@ done(); | ||
catch(e) { | ||
if (e.message === "`merge` takes 1 argument, 0 provided after:\nr.db(\""+dbName+"\").table(\""+tableName+"\")") { | ||
if (e.message === "`merge` takes at least 1 argument, 0 provided after:\nr.db(\""+dbName+"\").table(\""+tableName+"\")") { | ||
done(); | ||
@@ -222,0 +224,0 @@ } |
Sorry, the diff of this file is too big to display
822210
24867