Another REF CURSOR patch

Author: cjbj

src/njs/src/njsConnection.cpp

@@ -1019,13 +1019,6 @@ void Connection::PrepareAndBind (eBaton* executeBaton)
             }
           }
 
-          // Allocate handle for Ref Cursor
-          if ( executeBaton->binds[index]->type == DpiRSet )
-          { 
-             executeBaton->binds[index]->value = executeBaton->dpiconn->
-                                                               getStmt();
-          }
-
           // Convert v8::Date to Oracle DB Type for IN and IN/OUT binds
           if ( executeBaton->binds[index]->type == DpiTimestampLTZ &&
               // InOut bind
@@ -1074,13 +1067,6 @@ void Connection::PrepareAndBind (eBaton* executeBaton)
         for(unsigned int index = 0 ;index < executeBaton->binds.size();
             index++)
         {
-          // Allocate handle for Ref Cursor
-          if ( executeBaton->binds[index]->type == DpiRSet )
-          {
-            executeBaton->binds[index]->value = executeBaton->dpiconn->
-                                                              getStmt();
-          }
-
           // Allocate for OUT Binds
           // For DML Returning, allocation happens through callback
           if ( executeBaton->binds[index]->isOut &&
@@ -3021,6 +3007,10 @@ void Connection::cbDynBufferAllocate ( void *ctx, bool dmlReturning,
       bind->value = bind->dttmarr->init(nRows);
     }
     break;
+
+  case dpi::DpiRSet:
+    bind->value = executeBaton->dpiconn->getStmt ();
+    break;
   }
 }
 

src/njs/src/njsResultSet.cpp

@@ -187,11 +187,6 @@ NAN_PROPERTY_GETTER(ResultSet::GetMetaData)
   ResultSet* njsResultSet  = ObjectWrap::Unwrap<ResultSet>(args.Holder());
   string msg;
 
-  if ( njsResultSet->numCols_ == 0 )
-  {
-    njsResultSet->state_ = INVALID;
-  }
-
   if(!njsResultSet->njsconn_->isValid())
   {
     msg = NJSMessages::getErrorMsg ( errInvalidConnection );
@@ -253,11 +248,6 @@ NAN_METHOD(ResultSet::GetRow)
   getRowsBaton->njsRS     = njsResultSet;
   NanAssignPersistent(getRowsBaton->cb, callback );
 
-  if ( njsResultSet->numCols_ == 0 )
-  {
-    njsResultSet->state_ = INVALID ;
-  }
-
   if(njsResultSet->state_ == INVALID)
   {
     getRowsBaton->error = NJSMessages::getErrorMsg ( errInvalidResultSet );
@@ -303,11 +293,6 @@ NAN_METHOD(ResultSet::GetRows)
   getRowsBaton->njsRS   = njsResultSet;
   NanAssignPersistent(getRowsBaton->cb, callback );
 
-  if ( njsResultSet->numCols_ == 0 )
-  {
-    njsResultSet->state_ = INVALID;
-  }
-
   if(njsResultSet->state_ == INVALID)
   {
     getRowsBaton->error = NJSMessages::getErrorMsg ( errInvalidResultSet );