Fix merge

Author: cjbj

src/dpi/include/dpiStmt.h

@@ -101,14 +101,15 @@ typedef enum
 
 
 /* OCI Stmt Handle state
- *  For REFCURSORS state should be DpiStmtStateExecuted
+ *  For REFCURSORS state should be DPI_STMT_STATE_EXECUTED
  */
 #define DPI_STMT_STATE_UNDEFINED   (0)           // Undefined
 #define DPI_STMT_STATE_INITIALIZED (1)           // Initialized
 #define DPI_STMT_STATE_EXECUTED    (2)           // Executed
 #define DPI_STMT_STATE_ENDOFFETCH  (3)           // End of Fetch
 
 
+
 /*
  * For 11g/12c Compatability BIND/DEFINE calls expect ub8 in 12c & ub4 in 11g
  * Using this type makes is compile-time selction of 11g or 12c.
@@ -197,7 +198,7 @@ class Stmt
 
   virtual OCIError *getError () = 0;
 
-  virtual DpiStmtState getState () = 0;
+  virtual unsigned long getState () = 0;
 
   virtual ~Stmt(){};
 

src/dpi/src/dpiStmtImpl.cpp

@@ -89,7 +89,7 @@ StmtImpl::StmtImpl (EnvImpl *env, OCIEnv *envh, ConnImpl *conn,
   try : conn_(conn), errh_(NULL), svch_(svch),
         stmth_(NULL), numCols_ (0),meta_(NULL), stmtType_ (DpiStmtUnknown),
         isReturning_(false), isReturningSet_(false), refCursor_(false),
-        state_(0)
+        state_(DPI_STMT_STATE_UNDEFINED)
 {
   // create an OCIError object for this execution
   ociCallEnv (OCIHandleAlloc ((void *)envh, (dvoid **)&errh_,
@@ -729,27 +729,15 @@ bool StmtImpl::isReturning ()
      One of the possible values DpiStmtState
        (DpiStmtStateInitialized, DpiStmtStateExecute, DpiStmtEndOfFetch)
 */
-DpiStmtState StmtImpl::getState ()
+unsigned long StmtImpl::getState ()
 {
-  DpiStmtState ret = DpiStmtStateUndefined ;
-
-  if ( !state_ )
+  if ( state_ == DPI_STMT_STATE_UNDEFINED )
   {
     ociCall (OCIAttrGet (stmth_, OCI_HTYPE_STMT, (ub4*)&state_, NULL,
                          OCI_ATTR_STMT_STATE, errh_ ), errh_ );
   }
 
-  if ( ( state_ & OCI_STMT_STATE_INITIALIZED ) == OCI_STMT_STATE_INITIALIZED )
-    ret = DpiStmtStateInitialized;
-
-  if ( ( state_ & OCI_STMT_STATE_EXECUTED ) == OCI_STMT_STATE_EXECUTED )
-    ret = DpiStmtStateExecuted;
-
-  if ( ( state_ & OCI_STMT_STATE_END_OF_FETCH ) ==
-       OCI_STMT_STATE_END_OF_FETCH )
-    ret = DpiStmtStateEndOfFetch;
-
-  return ret;
+  return state_;
 }
 
 

src/dpi/src/dpiStmtImpl.h

@@ -94,7 +94,7 @@ class StmtImpl : public Stmt
 
   virtual OCIError *     getError () { return errh_;  }
 
-  virtual DpiStmtState   getState ();
+  virtual unsigned long  getState ();
 
 
   // Is the SQL statement DML or not ?

src/njs/src/njsConnection.cpp

@@ -935,12 +935,13 @@ void Connection::Async_Execute (uv_work_t *req)
        }
      }
 
-     /* For each OUT Binds of CURSOR type, get the number of columns */
+     /* For each OUT Binds of CURSOR type, get the dpistmt state */
      for ( unsigned int b = 0; b < executeBaton->binds.size (); b ++ )
      {
        Bind *bind = executeBaton->binds[b];
 
-       if ( bind->isOut && bind->type == dpi::DpiRSet )
+       /* Here bind->isOut is expected to be TRUE, and is checked earlier */
+       if ( bind->type == dpi::DpiRSet )
        {
          unsigned long state = ((Stmt*)bind->value)->getState ();
 
@@ -1424,14 +1425,14 @@ void Connection::DoDefines ( eBaton* executeBaton, const dpi::MetaData* meta,
         defines[col].fetchType = Connection::GetTargetType ( executeBaton,
                                              executeBaton->columnNames[col],
                                              meta[col].dbType );
+
         /*
          * the buffer size is increased to account for possible character
          * size expansion when data is converted from the DB character set
          * to AL32UTF8
          */
 
-		defines[col].maxSize   = (meta[col].dbSize) * csratio;
-
+        defines[col].maxSize   = (meta[col].dbSize) * csratio;
 
         if ( NJS_SIZE_T_OVERFLOW ( defines[col].maxSize,
                                        executeBaton->maxRows ) )
@@ -2064,6 +2065,10 @@ Handle<Value> Connection::GetValueRefCursor ( eBaton *executeBaton,
   {
     resultSet = NanNew(ResultSet::resultSetTemplate_s)->
                             GetFunction() ->NewInstance();
+    /* 
+     * IN case of REFCURSOR, bind->flags will indicate whether we got
+     * a valid handle, based on that numCols, metaData are queried.
+     */
     (ObjectWrap::Unwrap<ResultSet> (resultSet))->
                        setResultSet( (dpi::Stmt*)(bind->value),
                                      executeBaton);
@@ -2827,7 +2832,7 @@ void Connection::cbDynBufferAllocate ( void *ctx, bool dmlReturning,
   }
   else
   {
-    bind->ind = (short *)malloc ( nRows * sizeof ( short ) ) ;
+    bind->ind = (short *)malloc ( (size_t)nRows * sizeof ( short ) ) ;
     if( !bind->ind )
     {
       executeBaton->error = NJSMessages::getErrorMsg( errInsufficientMemory );

src/njs/src/njsResultSet.cpp

@@ -87,9 +87,9 @@ void ResultSet::setResultSet ( dpi::Stmt *stmt, eBaton *executeBaton )
      */
     this->numCols_     = 0;
     this->meta_        = NULL;
+    this->state_       = INVALID;
   }
 
-  this->state_         = INACTIVE;
   this->outFormat_     = executeBaton->outFormat;
   this->fetchRowCount_ = 0;
   this->rsEmpty_       = false;

src/njs/src/njsResultSet.h

@@ -133,8 +133,6 @@ class ResultSet: public ObjectWrap {
 
   static void clearFetchBuffer( Define* defineBuffers,
                                 unsigned int numCols );
-
-  static void Init ();
 
 
   dpi::Stmt            *dpistmt_;