fixed reader JS bindings so that reader handle gets destructed

Author: bjouhier

lib/oracle.js

@@ -35,21 +35,36 @@ exports.OCCITIMESTAMP = 7;
 exports.OCCINUMBER = 8;
 exports.OCCIBLOB = 9;
 
-// Reader.prototype.nextRow is implemented in JS rather than C++.
-// This is easier and also more efficient because we don't cross the JS/C++ boundary every time
-// we read a record.
-bindings.Reader.prototype.nextRow = function(cb) {
+// Reader is implemented in JS around a C++ handle
+// This is easier and also more efficient because we don't cross the JS/C++ boundary 
+// every time we read a record.
+function Reader(handle) {
+  this._handle = handle;
+  this._error = null;
+  this._rows = [];
+}
+
+Reader.prototype.nextRows = function(cb, count) {
+  this._handle.nextRows(cb, count);
+}
+
+Reader.prototype.nextRow = function(cb) {
   var self = this;
-  if (self._error || (self._rows && self._rows.length > 0)) {
+  if (!self._handle || self._error || (self._rows && self._rows.length > 0)) {
     process.nextTick(function() {
       cb(self._error, self._rows && self._rows.shift());
     });
   } else {
     // nextRows willl use the prefetch row count as window size
-    self.nextRows(function(err, result) {
+    self._handle.nextRows(function(err, result) {
       self._error = err || self._error;
       self._rows = result;
+      if (err || result.length === 0) self._handle = null;
       cb(self._error, self._rows && self._rows.shift());
     });
   }
 };
+
+bindings.Connection.prototype.reader = function(sql, args) {
+  return new Reader(this.readerHandle(sql, args));
+}

src/connection.cpp

@@ -22,7 +22,7 @@ void Connection::Init(Handle<Object> target) {
 
   NODE_SET_PROTOTYPE_METHOD(uni::Deref(constructorTemplate), "execute", Execute);
   NODE_SET_PROTOTYPE_METHOD(uni::Deref(constructorTemplate), "executeSync", ExecuteSync);
-  NODE_SET_PROTOTYPE_METHOD(uni::Deref(constructorTemplate), "reader", CreateReader);
+  NODE_SET_PROTOTYPE_METHOD(uni::Deref(constructorTemplate), "readerHandle", CreateReader);
   NODE_SET_PROTOTYPE_METHOD(uni::Deref(constructorTemplate), "close", Close);
   NODE_SET_PROTOTYPE_METHOD(uni::Deref(constructorTemplate), "isConnected", IsConnected);
   NODE_SET_PROTOTYPE_METHOD(uni::Deref(constructorTemplate), "setAutoCommit", SetAutoCommit);