rethinkdb - npm Package Compare versions

Comparing version 1.13.0-2 to 1.13.0-3

cursor.js

@@ -47,2 +47,3 @@ // Generated by CoffeeScript 1.7.0
     this._contFlag = false;
+    this._closeAsap = false;
     this._cont = null;
@@ -63,5 +64,26 @@ this._cbQueue = [];
     this._outstandingRequests -= 1;
-    this._endFlag = !(response.t === this._type);
+    if (response.t !== this._type) {
+      this._endFlag = true;
+      if (this._closeCb != null) {
+        switch (response.t) {
+          case protoResponseType.COMPILE_ERROR:
+            this._closeCb(mkErr(err.RqlRuntimeError, response, this._root));
+            break;
+          case protoResponseType.CLIENT_ERROR:
+            this._closeCb(mkErr(err.RqlRuntimeError, response, this._root));
+            break;
+          case protoResponseType.RUNTIME_ERROR:
+            this._closeCb(mkErr(err.RqlRuntimeError, response, this._root));
+            break;
+          default:
+            this._closeCb();
+        }
+      }
+    }
     this._contFlag = false;
-    this._promptNext();
+    if (this._closeAsap === false) {
+      this._promptNext();
+    } else {
+      this.close(this._closeCb);
+    }
     return this;
@@ -196,6 +218,37 @@ };
 
-  IterableResult.prototype.close = ar(function() {
-    if (!this._endFlag) {
-      this._outstandingRequests += 1;
-      return this._conn._endQuery(this._token);
+  IterableResult.prototype.close = varar(0, 1, function(cb) {
+    if (typeof cb === 'function') {
+      if (this._endFlag === true) {
+        return cb();
+      } else {
+        this._closeCb = cb;
+        if (this._outstandingRequests > 0) {
+          return this._closeAsap = true;
+        } else {
+          this._outstandingRequests += 1;
+          return this._conn._endQuery(this._token);
+        }
+      }
+    } else {
+      return new Promise((function(_this) {
+        return function(resolve, reject) {
+          if (_this._endFlag === true) {
+            return resolve();
+          } else {
+            _this._closeCb = function(err) {
+              if (err) {
+                return reject(err);
+              } else {
+                return resolve();
+              }
+            };
+            if (_this._outstandingRequests > 0) {
+              return _this._closeAsap = true;
+            } else {
+              _this._outstandingRequests += 1;
+              return _this._conn._endQuery(_this._token);
+            }
+          }
+        };
+      })(this));
     }
@@ -202,0 +255,0 @@ });

net.js

@@ -403,3 +403,3 @@ // Generated by CoffeeScript 1.7.0
     if (opts.batchConf != null) {
-      query.global_optargs['batchConf'] = r.expr(opts.batchConf).build();
+      query.global_optargs['batch_conf'] = r.expr(opts.batchConf).build();
     }
@@ -406,0 +406,0 @@ if ((opts.noreply == null) || !opts.noreply) {

package.json

 { "name" : "rethinkdb"
-, "version" : "1.13.0-2"
+, "version" : "1.13.0-3"
 , "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."

No alert changes

Improved metrics

Total package byte prevSize

162541

increased by0.91%

Lines of code

4773

increased by0.99%

No dependency changes