Comparing version 1.13.0-3 to 1.14.0-0
@@ -405,2 +405,5 @@ // Generated by CoffeeScript 1.7.0 | ||
} | ||
if (opts.arrayLimit != null) { | ||
query.global_optargs['array_limit'] = r.expr(opts.arrayLimit).build(); | ||
} | ||
if ((opts.noreply == null) || !opts.noreply) { | ||
@@ -407,0 +410,0 @@ this.outstandingCallbacks[token] = { |
{ "name" : "rethinkdb" | ||
, "version" : "1.13.0-3" | ||
, "version" : "1.14.0-0" | ||
, "main" : "rethinkdb" | ||
@@ -4,0 +4,0 @@ , "description" : "This package provides the JavaScript driver library for the RethinkDB database server for use either from node or your web-browser." |
@@ -148,2 +148,3 @@ // DO NOT EDIT | ||
INDEX_WAIT: 140, | ||
INDEX_RENAME: 156, | ||
FUNCALL: 64, | ||
@@ -212,3 +213,4 @@ BRANCH: 65, | ||
CHANGES: 152, | ||
ARGS: 154 | ||
ARGS: 154, | ||
BINARY: 155 | ||
}, | ||
@@ -215,0 +217,0 @@ |
32
util.js
// Generated by CoffeeScript 1.7.0 | ||
var convertPseudotype, err, mkAtom, mkErr, mkSeq, recursivelyConvertPseudotype, | ||
var convertPseudotype, err, mkAtom, mkErr, mkSeq, plural, recursivelyConvertPseudotype, | ||
__slice = [].slice; | ||
@@ -7,2 +7,10 @@ | ||
plural = function(number) { | ||
if (number === 1) { | ||
return ""; | ||
} else { | ||
return "s"; | ||
} | ||
}; | ||
module.exports.ar = function(fun) { | ||
@@ -13,3 +21,3 @@ return function() { | ||
if (args.length !== fun.length) { | ||
throw new err.RqlDriverError("Expected " + fun.length + " argument(s) but found " + args.length + "."); | ||
throw new err.RqlDriverError("Expected " + fun.length + " argument" + (plural(fun.length)) + " but found " + args.length + "."); | ||
} | ||
@@ -26,8 +34,8 @@ return fun.apply(this, args); | ||
if ((min != null) && (max == null)) { | ||
throw new err.RqlDriverError("Expected " + min + " or more argument(s) but found " + args.length + "."); | ||
throw new err.RqlDriverError("Expected " + min + " or more arguments but found " + args.length + "."); | ||
} | ||
if ((max != null) && (min == null)) { | ||
throw new err.RqlDriverError("Expected " + max + " or fewer argument(s) but found " + args.length + "."); | ||
throw new err.RqlDriverError("Expected " + max + " or fewer arguments but found " + args.length + "."); | ||
} | ||
throw new err.RqlDriverError("Expected between " + min + " and " + max + " argument(s) but found " + args.length + "."); | ||
throw new err.RqlDriverError("Expected between " + min + " and " + max + " arguments but found " + args.length + "."); | ||
} | ||
@@ -107,2 +115,16 @@ return fun.apply(this, args); | ||
break; | ||
case 'BINARY': | ||
switch (opts.binaryFormat) { | ||
case 'native': | ||
case void 0: | ||
if (obj['data'] == null) { | ||
throw new err.RqlDriverError("pseudo-type BINARY object missing expected field 'data'."); | ||
} | ||
return new Buffer(obj['data'], 'base64'); | ||
case 'raw': | ||
return obj; | ||
default: | ||
throw new err.RqlDriverError("Unknown binaryFormat run option " + opts.binaryFormat + "."); | ||
} | ||
break; | ||
default: | ||
@@ -109,0 +131,0 @@ return obj; |
Sorry, the diff of this file is too big to display
166718
4899