More REF CURSOR refactoring

Author: cjbj

src/njs/src/njsConnection.cpp

@@ -941,14 +941,19 @@ void Connection::Async_Execute (uv_work_t *req)
 
        if ( bind->isOut && bind->type == dpi::DpiRSet )
        {
-         bind->flags =
-           (((Stmt*)bind->value)->getState () == DpiStmtStateExecuted ) ?
-                NJS_BIND_REF_CURSOR_VALID : NJS_BIND_REF_CURSOR_INVALID ;
-         if ( ( bind->flags == NJS_BIND_REF_CURSOR_INVALID ) && 
-              ( bind->value != NULL ) )
+         unsigned long state = ((Stmt*)bind->value)->getState ();
+
+         if ( state == DPI_STMT_STATE_EXECUTED )
+         {
+           // set the prefetch on the valid cursor object
+           ((dpi::Stmt *)(bind->value))->prefetchRows ( 
+                                              executeBaton->prefetchRows ) ;
+         }
+         else
          {
            /* Release the invalid REFCURSOR to avoid any leaks */
            ((Stmt*)bind->value)->release ();
+           bind->value = NULL;
          }
        }
      }
@@ -1825,8 +1830,8 @@ void Connection::Async_AfterExecute(uv_work_t *req)
           /* ResultSet case, the statement object is ready for fetching */
          (ObjectWrap::Unwrap<ResultSet> (resultSet))->
                                   setResultSet( executeBaton->dpistmt,
-                                                executeBaton,
-                                                BIND_FLAGS_STMT_READY );
+                                                executeBaton);
+
           result->Set(NanNew<v8::String>("resultSet"), resultSet );
         }
         else
@@ -2059,11 +2064,7 @@ Handle<Value> Connection::GetValueRefCursor ( eBaton *executeBaton,
                             GetFunction() ->NewInstance();
     (ObjectWrap::Unwrap<ResultSet> (resultSet))->
                        setResultSet( (dpi::Stmt*)(bind->value),
-                                     executeBaton,
-                                     bind->flags );
-
-    // set the prefetch on the cursor object
-    ((dpi::Stmt*)(bind->value))->prefetchRows(executeBaton->prefetchRows);
+                                     executeBaton);
     value = resultSet;
   }
   else

src/njs/src/njsConnection.h

@@ -66,10 +66,6 @@ using namespace dpi;
 class Connection;
 class ProtoILob;
 
-/* Flags Constants */
-#define NJS_BIND_REF_CURSOR_INVALID  0  /*CURSOR not-fetch-able */
-#define NJS_BIND_REF_CURSOR_VALID    1  /*CURSOR fetch-able */
-
 /**
 * Structure used for binds
 **/
@@ -87,12 +83,11 @@ typedef struct Bind
   bool                isInOut;          // Date/Timestamp needs this info
   unsigned int        rowsReturned;     /* number rows returned for
                                            the bind (DML RETURNING) */
-  unsigned long       flags;            // Flags applicable for this BIND
   dpi::DateTimeArray* dttmarr;
 
   Bind () : key(""), value(NULL), extvalue (NULL), len(NULL), len2(NULL),
             maxSize(0), type(0), ind(NULL), isOut(false), isInOut(false),
-            rowsReturned(0), flags(BIND_FLAGS_STMT_NOT_READY), dttmarr ( NULL )
+            rowsReturned(0), dttmarr ( NULL )
   {}
 }Bind;
 

src/njs/src/njsResultSet.cpp

@@ -68,19 +68,18 @@ Persistent<FunctionTemplate> ResultSet::resultSetTemplate_s;
      stmt         -  dpi statement
      executeBaton - eBaton structure
 */
-void ResultSet::setResultSet ( dpi::Stmt *stmt, eBaton *executeBaton,
-                               unsigned long flags )
+void ResultSet::setResultSet ( dpi::Stmt *stmt, eBaton *executeBaton )
 {
   this->dpistmt_       = stmt;
   this->dpienv_        = executeBaton->dpienv;
   this->njsconn_       = executeBaton->njsconn;
-  if ( flags == NJS_BIND_REF_CURSOR_VALID )
+  if ( stmt )
   {
     this->meta_        = stmt->getMetaData();
     this->numCols_     = this->dpistmt_->numCols();
     this->state_       = INACTIVE;
   }
-  else if ( flags == NJS_BIND_REF_CURSOR_INVALID )
+  else
   {
     /* 
      * This could happen in REFCURSOR case, when the stored procedure

src/njs/src/njsResultSet.h

@@ -104,9 +104,7 @@ class ResultSet: public ObjectWrap {
 
    static void Init(Handle<Object> target);
 
-   void setResultSet ( dpi::Stmt *dpistmt, eBaton *executebaton,
-                       unsigned long flags );
-
+   void setResultSet ( dpi::Stmt *dpistmt, eBaton *executebaton );
 
    // Define ResultSet Constructor
    static Persistent<FunctionTemplate> resultSetTemplate_s ;

test/resultSet2.js

@@ -88,6 +88,13 @@ describe('55. resultSet2.js', function() {
              WHERE employees_id > p_in; \
          END; "; 
 
+  var proc2 =
+      "CREATE OR REPLACE PROCEDURE get_invalid_refcur ( p OUT SYS_REFCURSOR) \
+      AS \
+      BEGIN  \
+        NULL; \
+      END; ";
+
   beforeEach(function(done) {
     async.series([
       function(callback) {
@@ -130,6 +137,17 @@ describe('55. resultSet2.js', function() {
             callback();
           }
         );
+      },
+      function(callback) {
+        connection.execute (
+          proc2,
+          [],
+          { autoCommit : true },
+          function (err ) {
+            should.not.exist ( err );
+            callback();
+          }
+        );
       }
     ], done);
   })
@@ -154,6 +172,16 @@ describe('55. resultSet2.js', function() {
           }
         );
       },
+      function(callback) {
+        connection.execute (
+          'DROP PROCEDURE get_invalid_refcur',
+          function ( err ) {
+            should.not.exist ( err ) ;
+            callback ();
+          }
+        );
+      },
+
       function(callback) {
         connection.release( function(err) {
           should.not.exist(err);
@@ -340,11 +368,39 @@ describe('55. resultSet2.js', function() {
         }       
       }
     })
+
+    it ( '55.3.3 Invalid REF Cursor', function (done ) {
+      connection.should.be.ok;
+
+      connection.execute (
+        "BEGIN get_invalid_refcur ( :p ); END; ",
+        {
+          p : { type : oracledb.CURSOR, dir : oracledb.BIND_OUT }
+        },
+        function ( err, result) {
+          should.not.exist ( err );
+          fetchRowFromRS2 (result.outBinds.out, done);
+        });
+
+
+        function fetchRowFromRS2 (rs, cb ) {
+          if ( rs ) {
+            rs.getRow ( function ( err, row ) {
+              should.not.exist ( err ) ;
+              if ( row ) {
+                return fetchRowFromRS (rs, cb );
+              }
+            });
+          }
+          cb();
+        }
+    });
   })
 
   describe('55.4 release connection before close resultSet', function() {
     var conn2 = false;
     function fetchRowFromRS(rs, cb) {
+
       rs.getRow(function(err, row) {
         if(row) {
           return fetchRowFromRS(rs, cb);