Refactor REF CURSOR fixes

Author: cjbj

doc/api.md

@@ -2899,8 +2899,10 @@ Oracle REF CURSORS can be fetched in node-oracledb by binding a
 [`getRow()`](#getrow) or [`getRows()`](getrows).  When all rows have
 been fetched, or the application does not want to continue getting
 more rows, then the result set must be freed using
-[`close()`](#close).  If the cursor is not initialized by the procedure, the
-[`ResultSet`](#resultsetclass) object still requires to be closed.
+[`close()`](#close).  If the REF cursor is not set any value or is set to NULL
+in the PL/SQL procedure, the returned [`ResultSet`](#resultsetclass) object
+is an invalid  one and methods like getRows() returns an error when invoked
+on this object.
 
 When using Oracle Database 11gR2 or greater, then
 [`prefetchRows`](#propdbprefetchrows) can be used to tune the

src/dpi/include/dpiStmt.h

@@ -103,14 +103,10 @@ typedef enum
 /* OCI Stmt Handle state
  *  For REFCURSORS state should be DpiStmtStateExecuted
  */
-typedef enum
-{
-  DpiStmtStateUndefined   = -1,     /* Undefined */
-  DpiStmtStateInitialized = 0x001,  /* Initialized */
-  DpiStmtStateExecuted,             /* Executed */
-  DpiStmtStateEndOfFetch            /* End-Of-Fetch */
-} DpiStmtState;
-
+#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
 
 
 /*

src/njs/src/njsConnection.cpp

@@ -943,7 +943,13 @@ void Connection::Async_Execute (uv_work_t *req)
        {
          bind->flags =
            (((Stmt*)bind->value)->getState () == DpiStmtStateExecuted ) ?
-               BIND_FLAGS_STMT_READY : BIND_FLAGS_STMT_NOT_READY;
+                NJS_BIND_REF_CURSOR_VALID : NJS_BIND_REF_CURSOR_INVALID ;
+         if ( ( bind->flags == NJS_BIND_REF_CURSOR_INVALID ) && 
+              ( bind->value != NULL ) )
+         {
+           /* Release the invalid REFCURSOR to avoid any leaks */
+           ((Stmt*)bind->value)->release ();
+         }
        }
      }
 

src/njs/src/njsConnection.h

@@ -67,8 +67,8 @@ class Connection;
 class ProtoILob;
 
 /* Flags Constants */
-#define BIND_FLAGS_STMT_NOT_READY   0    /* REFCURSOR stmt not-fetch-able */
-#define BIND_FLAGS_STMT_READY       1    /* REFCURSOR stmt fetch-able */
+#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

src/njs/src/njsResultSet.cpp

@@ -74,12 +74,13 @@ void ResultSet::setResultSet ( dpi::Stmt *stmt, eBaton *executeBaton,
   this->dpistmt_       = stmt;
   this->dpienv_        = executeBaton->dpienv;
   this->njsconn_       = executeBaton->njsconn;
-  if ( ( flags & BIND_FLAGS_STMT_READY ) == BIND_FLAGS_STMT_READY )
+  if ( flags == NJS_BIND_REF_CURSOR_VALID )
   {
     this->meta_        = stmt->getMetaData();
     this->numCols_     = this->dpistmt_->numCols();
+    this->state_       = INACTIVE;
   }
-  else if ( ( flags & BIND_FLAGS_STMT_READY ) == BIND_FLAGS_STMT_NOT_READY )
+  else if ( flags == NJS_BIND_REF_CURSOR_INVALID )
   {
     /* 
      * This could happen in REFCURSOR case, when the stored procedure