Comparing version 1.14.0-0 to 1.15.0-0
@@ -13,2 +13,5 @@ // Generated by CoffeeScript 1.7.0 | ||
this.message = msg; | ||
if (Error.captureStackTrace != null) { | ||
Error.captureStackTrace(this, this); | ||
} | ||
} | ||
@@ -36,2 +39,5 @@ | ||
} | ||
if (Error.captureStackTrace != null) { | ||
Error.captureStackTrace(this, this); | ||
} | ||
} | ||
@@ -111,3 +117,7 @@ | ||
var tree; | ||
tree = composeCarrots(term, frames); | ||
if (frames.length === 0) { | ||
tree = [carrotify(composeTerm(term))]; | ||
} else { | ||
tree = composeCarrots(term, frames); | ||
} | ||
return (joinTree(tree)).replace(/[^\^]/g, ' '); | ||
@@ -114,0 +124,0 @@ }; |
16
net.js
@@ -402,5 +402,17 @@ // Generated by CoffeeScript 1.7.0 | ||
} | ||
if (opts.batchConf != null) { | ||
query.global_optargs['batch_conf'] = r.expr(opts.batchConf).build(); | ||
if (opts.minBatchRows != null) { | ||
query.global_optargs['min_batch_rows'] = r.expr(opts.minBatchRows).build(); | ||
} | ||
if (opts.maxBatchRows != null) { | ||
query.global_optargs['max_batch_rows'] = r.expr(opts.maxBatchRows).build(); | ||
} | ||
if (opts.minBatchBytes != null) { | ||
query.global_optargs['min_batch_bytes'] = r.expr(opts.minBatchBytes).build(); | ||
} | ||
if (opts.maxBatchSeconds != null) { | ||
query.global_optargs['max_batch_seconds'] = r.expr(opts.maxBatchSeconds).build(); | ||
} | ||
if (opts.firstBatchScaledownFactor != null) { | ||
query.global_optargs['first_batch_scaledown_factor'] = r.expr(opts.firstBatchScaledownFactor).build(); | ||
} | ||
if (opts.arrayLimit != null) { | ||
@@ -407,0 +419,0 @@ query.global_optargs['array_limit'] = r.expr(opts.arrayLimit).build(); |
{ "name" : "rethinkdb" | ||
, "version" : "1.14.0-0" | ||
, "version" : "1.15.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." |
@@ -72,2 +72,3 @@ // DO NOT EDIT | ||
JAVASCRIPT: 11, | ||
UUID: 169, | ||
HTTP: 153, | ||
@@ -123,2 +124,3 @@ ERROR: 12, | ||
NTH: 45, | ||
BRACKET: 170, | ||
INNER_JOIN: 48, | ||
@@ -215,3 +217,16 @@ OUTER_JOIN: 49, | ||
ARGS: 154, | ||
BINARY: 155 | ||
BINARY: 155, | ||
GEOJSON: 157, | ||
TO_GEOJSON: 158, | ||
POINT: 159, | ||
LINE: 160, | ||
POLYGON: 161, | ||
DISTANCE: 162, | ||
INTERSECTS: 163, | ||
INCLUDES: 164, | ||
CIRCLE: 165, | ||
GET_INTERSECTING: 166, | ||
FILL: 167, | ||
GET_NEAREST: 168, | ||
POLYGON_SUB: 171 | ||
}, | ||
@@ -218,0 +233,0 @@ |
Sorry, the diff of this file is too big to display
178094
5219